diff options
| author | gingerBill <bill@gingerbill.org> | 2023-05-18 11:26:57 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2023-05-18 11:26:57 +0100 |
| commit | 49d1f6aca03672469d8fda0dedd27e330e698edc (patch) | |
| tree | f762ab6c9b9d5ae0d374eda0b31a3c164fc94455 /core/runtime | |
| parent | e82146bf17908dcc3619c8ec34bb0e902d7c213d (diff) | |
| parent | 49cd9648b05c6eda252122104cb9b1faa2502602 (diff) | |
Merge branch 'master' into separate-int-word-sizes
Diffstat (limited to 'core/runtime')
| -rw-r--r-- | core/runtime/core_builtin.odin | 2 | ||||
| -rw-r--r-- | core/runtime/os_specific_windows.odin | 2 |
2 files changed, 2 insertions, 2 deletions
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 } 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 } |