diff --git a/src/include/dynamic_pool.hpp b/src/include/dynamic_pool.hpp index 3da4cce55..4829ea3e4 100644 --- a/src/include/dynamic_pool.hpp +++ b/src/include/dynamic_pool.hpp @@ -22,7 +22,7 @@ typedef struct bytes_dynamic_pool { static inline void dynamic_pool_malloc_block(as_dynamic_pool *dynamic_pool, as_error *err) { - dynamic_pool->pool[dynamic_pool->block_id] = (as_bytes *)malloc(sizeof(as_bytes) * dynamic_pool->current_block_size); + dynamic_pool->pool[dynamic_pool->block_id] = (as_bytes *)cf_malloc(sizeof(as_bytes) * dynamic_pool->current_block_size); if (dynamic_pool->pool[dynamic_pool->block_id] == NULL) { as_error_update(err, AEROSPIKE_ERR, "Failed to allocated memory for dynamic_pool"); @@ -54,7 +54,7 @@ static inline void dynamic_pool_expand_pool_if_needed(as_dynamic_pool *dynamic_p static inline void dynamic_pool_create_pool(as_dynamic_pool *dynamic_pool, as_error *err) { - dynamic_pool->pool = (as_bytes **)malloc( + dynamic_pool->pool = (as_bytes **)cf_malloc( AS_DYNAMIC_POOL_POINTER_BLOCK_SIZE * sizeof(as_bytes *)); if (dynamic_pool->pool == NULL) { as_error_update(err, AEROSPIKE_ERR, diff --git a/src/main/serializer.c b/src/main/serializer.c index 5ca5b3882..43f0a9117 100644 --- a/src/main/serializer.c +++ b/src/main/serializer.c @@ -249,7 +249,7 @@ void execute_user_callback(user_serializer_callback *user_callback_info, Py_ssize_t len; py_val = (char *)PyUnicode_AsUTF8AndSize(py_return, &len); - uint8_t* heap_b = (uint8_t *)calloc((uint32_t) len); + uint8_t* heap_b = (uint8_t *)cf_calloc((uint32_t) len, sizeof(uint8_t)); memcpy(heap_b, py_val, (uint32_t) len); as_bytes_init_wrap(*bytes, heap_b, (int32_t) len, allocate_buffer);