From 49e20bd9dd0291c40d9f24e8333449b8ecc95040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Sun, 9 Aug 2026 12:01:21 +0200 Subject: [PATCH] std.Io.Threaded: fix `fileWriteFileStreaming` error handling If the `getSize` inside `fileWriteFileStreaming` returns an error, two cases can happen: - If was canceled, it will return 0, which will make the calling function repeat it, in which case the cancellation is lost - If it truly returned an error, it will return 0, in which case the calling function will repeat the call and most likely `getSize` will fail again, resulting in an infinite loop Co-authored-by: Lukas Lalinsky Reviewed-on: https://codeberg.org/ziglang/zig/pulls/36140 Reviewed-by: mlugg --- lib/std/Io/Threaded.zig | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/std/Io/Threaded.zig b/lib/std/Io/Threaded.zig index eafcfb931b81bbe4a69a6bffd285c448aee8b605..715356e8d131ee9c552f1caa70e92c426b9592e7 100644 --- a/lib/std/Io/Threaded.zig +++ b/lib/std/Io/Threaded.zig @@ -11230,7 +11230,10 @@ fn fileWriteFileStreaming( var off: std.os.linux.off_t = undefined; const off_ptr: ?*std.os.linux.off_t, const count: usize = switch (file_reader.mode) { .positional => o: { - const size = file_reader.getSize() catch return 0; + const size = file_reader.getSize() catch |err| switch (err) { + error.Canceled => |e| return e, + else => break :sf, + }; off = std.math.cast(std.os.linux.off_t, file_reader.pos) orelse return error.ReadFailed; break :o .{ &off, @min(@backingInt(limit), size - file_reader.pos, max_count) }; }, @@ -11579,7 +11582,10 @@ fn fileWriteFilePositional( if (file_reader.pos != 0) break :fcf; if (offset != 0) break :fcf; if (limit != .unlimited) break :fcf; - const size = file_reader.getSize() catch break :fcf; + const size = file_reader.getSize() catch |err| switch (err) { + error.Canceled => |e| return e, + else => break :fcf, + }; if (header.len != 0 or reader_buffered.len != 0) { const n = try fileWritePositional(t, file, header, &.{limit.slice(reader_buffered)}, 1, offset); file_reader.interface.toss(n -| header.len); -- 2.54.0