aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2019-12-01 11:56:08 +0000
committergingerBill <bill@gingerbill.org>2019-12-01 11:56:08 +0000
commit7fbe0a6f2385e618ea4d3a724d2ed6147b6921bf (patch)
tree9e032434af0afa47f66a40aac3605ef7f14505d2 /core
parent3fd5c3cd851d8f4dfd441141ca7e96889f069933 (diff)
Fix nil comparisons for soa slices and dynamic arrays
Diffstat (limited to 'core')
-rw-r--r--core/os/os.odin7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/os/os.odin b/core/os/os.odin
index 7d6f4451d..7b3eac764 100644
--- a/core/os/os.odin
+++ b/core/os/os.odin
@@ -164,9 +164,10 @@ heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
return aligned_heap_alloc(size, alignment);
case .Free:
- assert(old_memory != nil);
- ptr := recover_original_pointer(old_memory);
- heap_free(ptr);
+ if old_memory != nil {
+ ptr := recover_original_pointer(old_memory);
+ heap_free(ptr);
+ }
return nil;
case .Free_All: