ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-31 03:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2531 from jasonKercher/fix2530

Browse Source 
add nil check to heap_alloc calls (issue 2530)
This commit is contained in:
Jeroen van Rijn
2023-05-11 20:20:03 +02:00
committed by GitHub
parent 82561cfbac f9c600a760
commit 968a07ed7a
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os.odin
+1 -1
View File
@@ -194,7 +194,7 @@ heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
ptr := uintptr(aligned_mem) ptr := uintptr(aligned_mem)
aligned_ptr := (ptr - 1 + uintptr(a)) & -uintptr(a) aligned_ptr := (ptr - 1 + uintptr(a)) & -uintptr(a)
diff := int(aligned_ptr - ptr) diff := int(aligned_ptr - ptr)
if (size + diff) > space { if (size + diff) > space || allocated_mem == nil {
return nil, .Out_Of_Memory return nil, .Out_Of_Memory
} }
core/os/os2/heap_linux.odin
+1 -1
View File
@@ -166,7 +166,7 @@ _heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
ptr := uintptr(aligned_mem) ptr := uintptr(aligned_mem)
aligned_ptr := (ptr - 1 + uintptr(a)) & -uintptr(a) aligned_ptr := (ptr - 1 + uintptr(a)) & -uintptr(a)
diff := int(aligned_ptr - ptr) diff := int(aligned_ptr - ptr)
if (size + diff) > space { if (size + diff) > space || allocated_mem == nil {
return nil, .Out_Of_Memory return nil, .Out_Of_Memory
} }
core/os/os2/heap_windows.odin
+1 -1
View File
@@ -52,7 +52,7 @@ _heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
ptr := uintptr(aligned_mem) ptr := uintptr(aligned_mem)
aligned_ptr := (ptr - 1 + uintptr(a)) & -uintptr(a) aligned_ptr := (ptr - 1 + uintptr(a)) & -uintptr(a)
diff := int(aligned_ptr - ptr) diff := int(aligned_ptr - ptr)
if (size + diff) > space { if (size + diff) > space || allocated_mem == nil {
return nil, .Out_Of_Memory return nil, .Out_Of_Memory
} }
core/runtime/os_specific_windows.odin
+1 -1
View File
@@ -112,7 +112,7 @@ _windows_default_alloc_or_resize :: proc "contextless" (size, alignment: int, ol
ptr := uintptr(aligned_mem) ptr := uintptr(aligned_mem)
aligned_ptr := (ptr - 1 + uintptr(a)) & -uintptr(a) aligned_ptr := (ptr - 1 + uintptr(a)) & -uintptr(a)
diff := int(aligned_ptr - ptr) diff := int(aligned_ptr - ptr)
if (size + diff) > space { if (size + diff) > space || allocated_mem == nil {
return nil, .Out_Of_Memory return nil, .Out_Of_Memory
} }