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

std.Io.Reader: fix readVec at end

Browse source
This commit is contained in:
Andrew Kelley 2025-07-31 14:34:21 -07:00
parent 264bd7053e
commit 0294e91451
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/std/Io/Reader.zig
View file

@ -406,7 +406,10 @@ pub fn readVec(r: *Reader, data: [][]u8) Error!usize {
r.seek = seek; r.seek = seek;
data[i] = buf[copy_len..]; data[i] = buf[copy_len..];
defer data[i] = buf; 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; const n = seek - r.seek;
r.seek = seek; r.seek = seek;
@ -1657,6 +1660,17 @@ test "expected error.EndOfStream" {
try std.testing.expectError(error.EndOfStream, r.take(3)); 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 { fn endingStream(r: *Reader, w: *Writer, limit: Limit) StreamError!usize {
_ = r; _ = r;
_ = w; _ = w;