emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add explicit null checks to system_allocator malloc/realloc

Browse source
This commit is contained in:
Meredith L. Patterson 2015-08-02 14:34:45 +02:00
parent f69698d734
commit 0653a9e48a
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/system_allocator.c
View file

@ -7,6 +7,9 @@
static void* system_alloc(HAllocator *allocator, size_t size) { static void* system_alloc(HAllocator *allocator, size_t size) {
void* ptr = malloc(size + sizeof(size_t)); void* ptr = malloc(size + sizeof(size_t));
if (!ptr) {
return NULL;
}
#ifdef DEBUG__MEMFILL #ifdef DEBUG__MEMFILL
memset(ptr, DEBUG__MEMFILL, size + sizeof(size_t)); memset(ptr, DEBUG__MEMFILL, size + sizeof(size_t));
#endif #endif
@ -15,9 +18,13 @@ static void* system_alloc(HAllocator *allocator, size_t size) {
} }
static void* system_realloc(HAllocator *allocator, void* ptr, size_t size) { static void* system_realloc(HAllocator *allocator, void* ptr, size_t size) {
if (ptr == NULL) if (!ptr) {
return system_alloc(allocator, size); return system_alloc(allocator, size);
}
ptr = realloc(ptr - sizeof(size_t), size + sizeof(size_t)); ptr = realloc(ptr - sizeof(size_t), size + sizeof(size_t));
if (!ptr) {
return NULL;
}
*(size_t*)ptr = size; *(size_t*)ptr = size;
#ifdef DEBUG__MEMFILL #ifdef DEBUG__MEMFILL
size_t old_size = *(size_t*)ptr; size_t old_size = *(size_t*)ptr;
@ -28,8 +35,9 @@ static void* system_realloc(HAllocator *allocator, void* ptr, size_t size) {
} }
static void system_free(HAllocator *allocator, void* ptr) { static void system_free(HAllocator *allocator, void* ptr) {
if (ptr != NULL) if (ptr) {
free(ptr - sizeof(size_t)); free(ptr - sizeof(size_t));
}
} }
HAllocator system_allocator = { HAllocator system_allocator = {