ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 23:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert default_resize_bytes_align logic to previous behaviour

Browse Source
This commit is contained in:
gingerBill
2022-10-19 16:06:36 +01:00
parent 8086c14dcc
commit 765969e6a3
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/mem/alloc.odin
+7 -8
View File
@@ -243,11 +243,13 @@ default_resize_bytes_align :: proc(old_data: []byte, new_size, alignment: int, a
return alloc_bytes(new_size, alignment, allocator, loc) return alloc_bytes(new_size, alignment, allocator, loc)
} }
if new_size == old_size {
return old_data, nil
}
if new_size == 0 { if new_size == 0 {
return nil, free_bytes(old_data, allocator, loc) err := free_bytes(old_data, allocator, loc)
return nil, err
}
if new_size == old_size {
return old_data, .None
} }
new_memory, err := alloc_bytes(new_size, alignment, allocator, loc) new_memory, err := alloc_bytes(new_size, alignment, allocator, loc)
@@ -256,9 +258,6 @@ default_resize_bytes_align :: proc(old_data: []byte, new_size, alignment: int, a
} }
runtime.copy(new_memory, old_data) runtime.copy(new_memory, old_data)
err1 := free_bytes(old_data, allocator, loc) free_bytes(old_data, allocator, loc)
if err == nil {
err = err1
}
return new_memory, err return new_memory, err
} }