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

gpa: fix leak in freeLarge and memory limit accounting in resize and resizeLarge

Browse Source
This commit is contained in:
Matthew Borkowski 2021-12-01 03:56:44 -05:00 committed by Andrew Kelley
parent 8c36243136
commit 02a1f838e6
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/std/heap/general_purpose_allocator.zig
View File

@ -561,11 +561,13 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type {
}
self.total_requested_bytes = new_req_bytes;
}
errdefer if (config.enable_memory_limit) {
self.total_requested_bytes = prev_req_bytes;
};
const result_len = self.backing_allocator.rawResize(old_mem, old_align, new_size, len_align, ret_addr) orelse return null;
const result_len = self.backing_allocator.rawResize(old_mem, old_align, new_size, len_align, ret_addr) orelse {
if (config.enable_memory_limit) {
self.total_requested_bytes = prev_req_bytes;
}
return null;
};
if (config.enable_memory_limit) {
entry.value_ptr.requested_size = new_size;
@ -623,6 +625,10 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type {
});
}
if (!config.never_unmap) {
self.backing_allocator.rawFree(old_mem, old_align, ret_addr);
}
if (config.enable_memory_limit) {
self.total_requested_bytes -= entry.value_ptr.requested_size;
}
@ -711,9 +717,6 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type {
}
self.total_requested_bytes = new_req_bytes;
}
errdefer if (config.enable_memory_limit) {
self.total_requested_bytes = prev_req_bytes;
};
const new_aligned_size = math.max(new_size, old_align);
const new_size_class = math.ceilPowerOfTwoAssert(usize, new_aligned_size);
@ -728,6 +731,10 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type {
}
return new_size;
}
if (config.enable_memory_limit) {
self.total_requested_bytes = prev_req_bytes;
}
return null;
}