motiejus/zig
1
Fork 0
Code Releases Activity

std.BufSet.clone: fix key ownership

Browse Source 
This was introduced in d1a4654834: when a
BufSet clones the keys, it used to assign the new pointers to the old
struct. Fix that by assigning the pointers to the correct, i.e. the new,
struct.

This caused double-free when using arena allocator for the new struct,
also in the test case.
This commit is contained in:
Motiejus Jakštys
2022-03-01 14:55:15 +02:00
committed by Andrew Kelley
parent 52205a3c16
commit 543bee0adf
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/std/buf_set.zig
View File

@@ -78,7 +78,7 @@ pub const BufSet = struct {
) Allocator.Error!BufSet {
var cloned_hashmap = try self.hash_map.cloneWithAllocator(new_allocator);
var cloned = BufSet{ .hash_map = cloned_hashmap };
var it = self.hash_map.keyIterator();
var it = cloned.hash_map.keyIterator();
while (it.next()) |key_ptr| {
key_ptr.* = try cloned.copy(key_ptr.*);
}
@@ -132,3 +132,16 @@ test "BufSet clone" {
original.cloneWithAllocator(testing.failing_allocator),
);
}
test "BufSet.clone with arena" {
var allocator = std.testing.allocator;
var arena = std.heap.ArenaAllocator.init(allocator);
defer arena.deinit();
var buf = BufSet.init(allocator);
defer buf.deinit();
try buf.insert("member1");
try buf.insert("member2");
_ = try buf.cloneWithAllocator(arena.allocator());
}