mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-14 21:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix freeing memory across bounds

Browse Source
This commit is contained in:
Benjamin Feng 2019-12-04 22:43:02 -06:00
parent 86ae75363e
commit 30da6d49f4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/std/heap.zig
View File

@ -379,8 +379,11 @@ const WasmPageAllocator = struct {
}
if (free_start < extendedOffset()) {
conventional.recycle(free_start, free_end - free_start);
} else {
const clamped_end = std.math.min(extendedOffset(), free_end);
conventional.recycle(free_start, clamped_end - free_start);
}
if (free_end > extendedOffset()) {
if (extended.totalPages() == 0) {
// Steal the last page from the memory currently being recycled
// TODO: would it be better if we use the first page instead?
@ -390,7 +393,8 @@ const WasmPageAllocator = struct {
// Since this is the first page being freed and we consume it, assume *nothing* is free.
std.mem.set(u8, extended.bytes, FreeBlock.used);
}
extended.recycle(free_start - extendedOffset(), free_end - free_start);
const clamped_start = std.math.max(extendedOffset(), free_start);
extended.recycle(clamped_start - extendedOffset(), free_end - clamped_start);
}
}