Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

translate-c: fix a use-after-free bug

master
Andrew Kelley 2020-05-23 23:15:58 -04:00
parent 2952604d5d
commit 8a3cd82b85
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src-self-hosted/translate_c.zig
View File

@ -135,12 +135,13 @@ const Scope = struct {
/// Given the desired name, return a name that does not shadow anything from outer scopes. /// Given the desired name, return a name that does not shadow anything from outer scopes.
/// Inserts the returned name into the scope. /// Inserts the returned name into the scope.
fn makeMangledName(scope: *Block, c: *Context, name: []const u8) ![]const u8 { fn makeMangledName(scope: *Block, c: *Context, name: []const u8) ![]const u8 {
var proposed_name = name; const name_copy = try c.arena.dupe(u8, name);
var proposed_name = name_copy;
while (scope.contains(proposed_name)) { while (scope.contains(proposed_name)) {
scope.mangle_count += 1; scope.mangle_count += 1;
proposed_name = try std.fmt.allocPrint(c.arena, "{}_{}", .{ name, scope.mangle_count }); proposed_name = try std.fmt.allocPrint(c.arena, "{}_{}", .{ name, scope.mangle_count });
} }
try scope.variables.append(.{ .name = name, .alias = proposed_name }); try scope.variables.append(.{ .name = name_copy, .alias = proposed_name });
return proposed_name; return proposed_name;
} }