zig

commit 0294e91451ba8fb06a40cbd0d3da80e2792f5923 (tree)
parent 264bd7053edb948d0f96525b54b859c0422e12a2
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Thu, 31 Jul 2025 14:34:21 -0700

std.Io.Reader: fix readVec at end

Diffstat:
M
lib/std/Io/Reader.zig
 | 
16
+++++++++++++++-

1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/lib/std/Io/Reader.zig b/lib/std/Io/Reader.zig
@@ -406,7 +406,10 @@ pub fn readVec(r: *Reader, data: [][]u8) Error!usize {
         r.seek = seek;
         data[i] = buf[copy_len..];
         defer data[i] = buf;
-        return n + try r.vtable.readVec(r, data[i..]);
+        return n + (r.vtable.readVec(r, data[i..]) catch |err| switch (err) {
+            error.EndOfStream => if (n == 0) return error.EndOfStream else 0,
+            error.ReadFailed => return error.ReadFailed,
+        });
     }
     const n = seek - r.seek;
     r.seek = seek;
@@ -1657,6 +1660,17 @@ test "expected error.EndOfStream" {
     try std.testing.expectError(error.EndOfStream, r.take(3));
 }
 
+test "readVec at end" {
+    var reader_buffer: [8]u8 = "abcd1234".*;
+    var reader: testing.Reader = .init(&reader_buffer, &.{});
+    reader.interface.end = reader_buffer.len;
+
+    var out: [16]u8 = undefined;
+    var vecs: [1][]u8 = .{&out};
+    try testing.expectEqual(8, try reader.interface.readVec(&vecs));
+    try testing.expectEqualStrings("abcd1234", vecs[0][0..8]);
+}
+
 fn endingStream(r: *Reader, w: *Writer, limit: Limit) StreamError!usize {
     _ = r;
     _ = w;