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

Fix: Issue with non-zeroed memory after arena_temp_and;

Browse Source 
Fix: total_used field of growing Arena was not decremented correctly in arena_temp_end;
This commit is contained in:
alektron
2025-01-15 17:59:30 +01:00
parent 432c49e214
commit a0c20023fc
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/runtime/default_temp_allocator_arena.odin
+2 -1
View File
@@ -282,9 +282,10 @@ arena_temp_end :: proc(temp: Arena_Temp, loc := #caller_location) {
if block := arena.curr_block; block != nil { if block := arena.curr_block; block != nil {
assert(block.used >= temp.used, "out of order use of arena_temp_end", loc) assert(block.used >= temp.used, "out of order use of arena_temp_end", loc)
amount_to_zero := min(block.used-temp.used, block.capacity-block.used) amount_to_zero := block.used-temp.used
intrinsics.mem_zero(block.base[temp.used:], amount_to_zero) intrinsics.mem_zero(block.base[temp.used:], amount_to_zero)
block.used = temp.used block.used = temp.used
arena.total_used -= amount_to_zero
} }
} }
core/mem/virtual/arena.odin
+2 -1
View File
@@ -402,9 +402,10 @@ arena_temp_end :: proc(temp: Arena_Temp, loc := #caller_location) {
if block := arena.curr_block; block != nil { if block := arena.curr_block; block != nil {
assert(block.used >= temp.used, "out of order use of arena_temp_end", loc) assert(block.used >= temp.used, "out of order use of arena_temp_end", loc)
amount_to_zero := min(block.used-temp.used, block.reserved-block.used) amount_to_zero := block.used-temp.used
mem.zero_slice(block.base[temp.used:][:amount_to_zero]) mem.zero_slice(block.base[temp.used:][:amount_to_zero])
block.used = temp.used block.used = temp.used
arena.total_used -= amount_to_zero
} }
} }