motiejus/zig
1
Fork 0
Code Releases Activity

std.json: don't free struct default values

Browse Source 
Closes https://github.com/ziglang/zig/issues/9509.
This commit is contained in:
John Schmidt
2023-02-04 14:42:42 +01:00
parent b42caff2a2
commit b1dd4b17d8
2 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/std/json.zig
View File

@@ -1745,7 +1745,37 @@ pub fn parseFree(comptime T: type, value: T, options: ParseOptions) void {
.Struct => |structInfo| {
inline for (structInfo.fields) |field| {
if (!field.is_comptime) {
parseFree(field.type, @field(value, field.name), options);
var should_free = true;
if (field.default_value) |default| {
switch (@typeInfo(field.type)) {
// We must not attempt to free pointers to struct default values
.Pointer => |fieldPtrInfo| {
const field_value = @field(value, field.name);
const field_ptr = switch (fieldPtrInfo.size) {
.One => field_value,
.Slice => field_value.ptr,
else => unreachable, // Other pointer types are not parseable
};
const field_addr = @ptrToInt(field_ptr);
const casted_default = @ptrCast(*const field.type, @alignCast(@alignOf(field.type), default)).*;
const default_ptr = switch (fieldPtrInfo.size) {
.One => casted_default,
.Slice => casted_default.ptr,
else => unreachable, // Other pointer types are not parseable
};
const default_addr = @ptrToInt(default_ptr);
if (field_addr == default_addr) {
should_free = false;
}
},
else => {},
}
}
if (should_free) {
parseFree(field.type, @field(value, field.name), options);
}
}
}
},