mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 05:44:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #20000 from Frojdholm/fix-gpa-crash-when-deallocating-metadata

Browse source 
Fix GeneralPurposeAllocator crash when deallocating metadata
This commit is contained in:
Andrew Kelley 2024-06-05 21:13:58 -04:00
parent 236fb915cc
commit 7a29161e8e
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/std/heap/general_purpose_allocator.zig
View file

@ -445,8 +445,11 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type {
} }
} }
// free retained metadata for small allocations // free retained metadata for small allocations
var empty_it = self.empty_buckets.inorderIterator(); while (self.empty_buckets.getMin()) |node| {
while (empty_it.next()) |node| { // remove the node from the tree before destroying it
var entry = self.empty_buckets.getEntryForExisting(node);
entry.set(null);
var bucket = node.key; var bucket = node.key;
if (config.never_unmap) { if (config.never_unmap) {
// free page that was intentionally leaked by never_unmap // free page that was intentionally leaked by never_unmap
@ -1455,3 +1458,19 @@ test "bug 9995 fix, large allocs count requested size not backing size" {
buf = try allocator.realloc(buf, 2); buf = try allocator.realloc(buf, 2);
try std.testing.expect(gpa.total_requested_bytes == 2); try std.testing.expect(gpa.total_requested_bytes == 2);
} }
test "retain metadata and never unmap" {
var gpa = std.heap.GeneralPurposeAllocator(.{
.safety = true,
.never_unmap = true,
.retain_metadata = true,
}){};
defer std.debug.assert(gpa.deinit() == .ok);
const allocator = gpa.allocator();
const alloc = try allocator.alloc(u8, 8);
allocator.free(alloc);
const alloc2 = try allocator.alloc(u8, 8);
allocator.free(alloc2);
}