mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-05 21:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sema: fix error set memory unsafety

Browse Source 
All error names are supposed to be owned by Module.
This commit is contained in:
Veikka Tuominen 2022-03-27 20:31:54 +03:00
parent d15bbebe2e
commit bda7993beb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Sema.zig
View File

@ -2317,8 +2317,8 @@ fn zirErrorSetDecl(
const extra_index_end = extra_index + (extra.data.fields_len * 2);
while (extra_index < extra_index_end) : (extra_index += 2) { // +2 to skip over doc_string
const str_index = sema.code.extra[extra_index];
const name = try new_decl_arena_allocator.dupe(u8, sema.code.nullTerminatedString(str_index));
const result = names.getOrPutAssumeCapacity(name);
const kv = try sema.mod.getErrorValue(sema.code.nullTerminatedString(str_index));
const result = names.getOrPutAssumeCapacity(kv.key);
assert(!result.found_existing); // verified in AstGen
}
@ -13113,11 +13113,10 @@ fn zirReify(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.I
// TODO use reflection instead of magic numbers here
// error_set: type,
const name_val = struct_val[0];
const name_str = try name_val.toAllocatedBytes(Type.initTag(.const_slice_u8), sema.arena, target);
names.putAssumeCapacityNoClobber(
try name_val.toAllocatedBytes(Type.initTag(.const_slice_u8), sema.arena, target),
{},
);
const kv = try sema.mod.getErrorValue(name_str);
names.putAssumeCapacityNoClobber(kv.key, {});
}
// names must be sorted