Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-24 21:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

print message instead of panicking on buffer overrun

Browse Source
This commit is contained in:
Parzival-3141 2023-05-02 04:23:43 -04:00
parent 3185ff0b9f
commit 0c5b9cb0c0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/std/Build/Step.zig
View File

@ -236,14 +236,20 @@ pub fn make(s: *Step, options: MakeOptions) error{ MakeFailed, MakeSkipped }!voi
var stream = std.io.fixedBufferStream(msg_buffer); var stream = std.io.fixedBufferStream(msg_buffer);
const writer = stream.writer(); const writer = stream.writer();
writer.writeAll("step failed with error ") catch @panic("msg_buffer OOM"); writer.writeAll("step failed with error ") catch unreachable;
writer.writeAll(@errorName(err)) catch @panic("msg_buffer OOM"); writer.writeAll(@errorName(err)) catch @panic("msg_buffer OOM");
if (@errorReturnTrace()) |trace| { if (@errorReturnTrace()) |trace| {
writer.writeAll(":") catch @panic("msg_buffer OOM"); writer.writeAll(":") catch @panic("msg_buffer OOM");
trace.format("", .{}, writer) catch @panic("msg_buffer OOM"); trace.format("", .{}, writer) catch {
// Assumes trace.format has written everything up until failure
const overrun_msg = ".... errorReturnTrace exceeds buffer size!";
for (msg_buffer[stream.pos - overrun_msg.len .. stream.pos], 0..) |*value, i| {
value.* = overrun_msg[i];
}
};
} }
_ = arena.resize(msg_buffer, stream.pos);
s.result_error_msgs.append(arena, msg_buffer[0..stream.pos]) catch @panic("OOM"); s.result_error_msgs.append(arena, msg_buffer[0..stream.pos]) catch @panic("OOM");
return error.MakeFailed; return error.MakeFailed;
}, },