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

compiler: fix UAF when writing builtin.zig

Browse source
This commit is contained in:
Andrew Kelley 2023-12-24 21:50:37 -07:00
parent 44e2dbe117
commit 4f8a44cd0f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Builtin.zig
View file

@ -279,7 +279,8 @@ pub fn populateFile(comp: *Compilation, mod: *Module, file: *File) !void {
} }
fn writeFile(file: *File, mod: *Module) !void { fn writeFile(file: *File, mod: *Module) !void {
var af = try mod.root.atomicFile(mod.root_src_path, .{ .make_path = true }); var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
var af = try mod.root.atomicFile(mod.root_src_path, .{ .make_path = true }, &buf);
defer af.deinit(); defer af.deinit();
try af.file.writeAll(file.source); try af.file.writeAll(file.source);
try af.finish(); try af.finish();

4
src/Package.zig
View file

@ -88,10 +88,10 @@ pub const Path = struct {
p: Path, p: Path,
sub_path: []const u8, sub_path: []const u8,
options: fs.Dir.AtomicFileOptions, options: fs.Dir.AtomicFileOptions,
buf: *[fs.MAX_PATH_BYTES]u8,
) !fs.AtomicFile { ) !fs.AtomicFile {
var buf: [fs.MAX_PATH_BYTES]u8 = undefined;
const joined_path = if (p.sub_path.len == 0) sub_path else p: { const joined_path = if (p.sub_path.len == 0) sub_path else p: {
break :p std.fmt.bufPrint(&buf, "{s}" ++ fs.path.sep_str ++ "{s}", .{ break :p std.fmt.bufPrint(buf, "{s}" ++ fs.path.sep_str ++ "{s}", .{
p.sub_path, sub_path, p.sub_path, sub_path,
}) catch return error.NameTooLong; }) catch return error.NameTooLong;
}; };