From 5c106abe3fd1850c3880fcd6753e3e2273c1eded Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 10 Nov 2022 12:01:40 +0000 Subject: [PATCH] Make `map_alloc_dynamic` handle the `nil_allocator()` --- core/runtime/dynamic_map_internal.odin | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/runtime/dynamic_map_internal.odin b/core/runtime/dynamic_map_internal.odin index 7f1ea5e68..4a246fd18 100644 --- a/core/runtime/dynamic_map_internal.odin +++ b/core/runtime/dynamic_map_internal.odin @@ -334,6 +334,10 @@ map_alloc_dynamic :: proc "odin" (info: ^Map_Info, log2_capacity: uintptr, alloc data := mem_alloc_non_zeroed(int(size), MAP_CACHE_LINE_SIZE, allocator, loc) or_return data_ptr := uintptr(raw_data(data)) + if data_ptr == 0 { + err = .Out_Of_Memory + return + } if intrinsics.expect(data_ptr & CACHE_MASK != 0, false) { panic("allocation not aligned to a cache line", loc) } else {