motiejus/zig
1
Fork 0
Code Releases Activity

Fix general purpose allocator incorrectly modifying total_requested_bytes in some cases

Browse Source
This commit is contained in:
Nathanaël Courant
2020-12-07 23:27:37 +01:00
committed by Andrew Kelley
parent 5c13a4e54a
commit 1ec0261518
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -517,7 +517,11 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type {
second_free_stack_trace,
});
if (new_size == 0) {
// Recoverable.
// Recoverable. Restore self.total_requested_bytes if needed, as we
// don't return an error value so the errdefer above does not run.
if (config.enable_memory_limit) {
self.total_requested_bytes = prev_req_bytes;
}
return @as(usize, 0);
}
@panic("Unrecoverable double free");