diff options
Diffstat (limited to 'src/common_memory.cpp')
| -rw-r--r-- | src/common_memory.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/common_memory.cpp b/src/common_memory.cpp index 8d1161f25..bd3d2d5de 100644 --- a/src/common_memory.cpp +++ b/src/common_memory.cpp @@ -350,11 +350,16 @@ GB_ALLOCATOR_PROC(heap_allocator_proc) { gb_zero_size(ptr, size); } break; - case gbAllocation_Free: { - free(old_memory); - } break; + case gbAllocation_Free: + if (!old_memory) { + free(old_memory); + } + break; case gbAllocation_Resize: + if (!old_memory) { + break; + } if (size == 0) { free(old_memory); break; @@ -381,10 +386,15 @@ GB_ALLOCATOR_PROC(heap_allocator_proc) { break; case gbAllocation_Free: - free(old_memory); + if (!old_memory) { + free(old_memory); + } break; case gbAllocation_Resize: + if (!old_memory) { + break; + } if (size == 0) { free(old_memory); break; |