From f5615b204c199c4afea2c1c77e4a2212511f401d Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 6 Sep 2021 16:50:13 +0100 Subject: Minor fix to `heap_allocator_proc` in common_memory.cpp --- src/common_memory.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/common_memory.cpp') 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; -- cgit v1.2.3