From f9c600a76008a8404479e8107066cdaf2dea3eaf Mon Sep 17 00:00:00 2001 From: jason Date: Thu, 11 May 2023 14:04:09 -0400 Subject: add nil check to heap_alloc calls (issue 2530) --- core/runtime/os_specific_windows.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/runtime') diff --git a/core/runtime/os_specific_windows.odin b/core/runtime/os_specific_windows.odin index 6e7474257..732715793 100644 --- a/core/runtime/os_specific_windows.odin +++ b/core/runtime/os_specific_windows.odin @@ -112,7 +112,7 @@ _windows_default_alloc_or_resize :: proc "contextless" (size, alignment: int, ol ptr := uintptr(aligned_mem) aligned_ptr := (ptr - 1 + uintptr(a)) & -uintptr(a) diff := int(aligned_ptr - ptr) - if (size + diff) > space { + if (size + diff) > space || allocated_mem == nil { return nil, .Out_Of_Memory } -- cgit v1.2.3 From 1c5ce75d9f6155c27739bc74a293f182298c3dca Mon Sep 17 00:00:00 2001 From: Tetralux Date: Fri, 12 May 2023 23:04:25 +0000 Subject: [runtime] Pass along #caller_location in append_nothing() --- core/runtime/core_builtin.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/runtime') diff --git a/core/runtime/core_builtin.odin b/core/runtime/core_builtin.odin index 4b152e7cc..bd919247e 100644 --- a/core/runtime/core_builtin.odin +++ b/core/runtime/core_builtin.odin @@ -401,7 +401,7 @@ append_nothing :: proc(array: ^$T/[dynamic]$E, loc := #caller_location) -> int { return 0 } prev_len := len(array) - resize(array, len(array)+1) + resize(array, len(array)+1, loc) return len(array)-prev_len } -- cgit v1.2.3