- tried to fix memory errors
This commit is contained in:
@@ -112,18 +112,18 @@ struct private_allocator_s
|
||||
*/
|
||||
static void *allocate_special(private_allocator_t *this,size_t bytes, char * file,int line, bool use_mutex)
|
||||
{
|
||||
memory_hdr_t *allocated_memory = malloc(sizeof(memory_hdr_t) + bytes);
|
||||
|
||||
if (allocated_memory == NULL)
|
||||
memory_hdr_t *allocated_memory = malloc(sizeof(memory_hdr_t) + bytes);;
|
||||
|
||||
if (allocated_memory == NULL)
|
||||
{
|
||||
return allocated_memory;
|
||||
}
|
||||
|
||||
|
||||
if (use_mutex)
|
||||
{
|
||||
pthread_mutex_lock( &(this->mutex));
|
||||
}
|
||||
|
||||
|
||||
allocated_memory->info.line = line;
|
||||
allocated_memory->info.filename = file;
|
||||
allocated_memory->info.size_of_memory = bytes;
|
||||
@@ -326,6 +326,11 @@ chunk_t allocator_alloc_as_chunk(size_t bytes)
|
||||
|
||||
}
|
||||
|
||||
void * allocator_realloc(void * old, size_t newsize)
|
||||
{
|
||||
return realloc(old,newsize);
|
||||
}
|
||||
|
||||
void * allocator_clone_bytes(void * pointer, size_t size)
|
||||
{
|
||||
void *data;
|
||||
|
||||
@@ -209,11 +209,10 @@
|
||||
*/
|
||||
#define report_memory_leaks(void) (global_allocator->report_memory_leaks(global_allocator))
|
||||
#else
|
||||
#define allocator_alloc(bytes) (malloc(bytes))
|
||||
|
||||
|
||||
#define allocator_alloc(bytes) (malloc(bytes))
|
||||
chunk_t allocator_alloc_as_chunk(size_t bytes);
|
||||
|
||||
#define allocator_realloc(old,bytes) (realloc(old,bytes))
|
||||
void * allocator_realloc(void * old, size_t newsize);
|
||||
#define allocator_free(pointer) (free(pointer))
|
||||
void * allocator_clone_bytes(void * pointer, size_t size);
|
||||
void allocator_free_chunk(chunk_t chunk);
|
||||
|
||||
Reference in New Issue
Block a user