Mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-05-31 13:27:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Maker.Step.Run: fix leak in evalGeneric

Browse Source
This commit is contained in:
Andrew Kelley
2026-05-25 20:34:44 -07:00
parent 5b022623cf
commit 1d750d7067
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compiler/Maker/Step/Run.zig
+3 -6
View File
@@ -1374,6 +1374,7 @@ fn sendRunFuzzTestMessage(
}
}
/// Uses `arena` to allocate the result.
fn evalGeneric(
arena: Allocator,
run_index: Configuration.Step.Index,
@@ -1382,7 +1383,6 @@ fn evalGeneric(
) !EvalGenericResult {
const graph = maker.graph;
const io = graph.io;
const gpa = maker.gpa;
const conf = &maker.scanned_config.configuration;
const conf_step = run_index.ptr(conf);
const conf_run = conf_step.extended.get(conf.extra).run;
@@ -1436,8 +1436,7 @@ fn evalGeneric(
if (child.stderr) |stderr| {
var multi_reader_buffer: Io.File.MultiReader.Buffer(2) = undefined;
var multi_reader: Io.File.MultiReader = undefined;
multi_reader.init(gpa, io, multi_reader_buffer.toStreams(), &.{ stdout, stderr });
defer multi_reader.deinit();
multi_reader.init(arena, io, multi_reader_buffer.toStreams(), &.{ stdout, stderr });
const stdout_reader = multi_reader.reader(0);
const stderr_reader = multi_reader.reader(1);
@@ -1457,9 +1456,7 @@ fn evalGeneric(
try multi_reader.checkAnyError();
// TODO: this string can leak since alloc below can return error.
stdout_bytes = try multi_reader.toOwnedSlice(0);
// TODO: this string can leak since its allocated using gpa and `try child.wait(io)` below can fail.
stderr_bytes = try multi_reader.toOwnedSlice(1);
} else {
var stdout_reader = stdout.readerStreaming(io, &.{});
@@ -2201,7 +2198,7 @@ fn spawnChildAndCollect(
try setColorEnvironmentVariables(&conf_run, environ_map, terminal_mode);
const started: Io.Clock.Timestamp = .now(io, .awake);
const result = evalGeneric(arena, run_index, maker, spawn_options) catch |err| switch (err) {
const result = evalGeneric(graph.arena, run_index, maker, spawn_options) catch |err| switch (err) {
error.Canceled => |e| return e,
else => |e| e,
};