authorgravatar for paul.verigo@gmail.comPavel Verigo <paul.verigo@gmail.com> 2024-05-08 16:29:29+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-05-22 07:02:16-07:00
logfa4a626faccd1c80d3509ed8d95152fc100a5925
tree019cc64594dc65b97bcbdc59f69f028402250c1d
parent33c3bf06317a19ec7cb2f7fdbea51acae66ef963

std.compress.flate: fix panic when reading into empty buffer

1 files changed, 12 insertions(+), 0 deletions(-)

lib/std/compress/flate/inflate.zig+12
......@@ -347,6 +347,7 @@ pub fn Inflate(comptime container: Container, comptime LookaheadType: type, comp
347347 /// If the number of bytes read is 0, it means end of stream.
348348 /// End of stream is not an error condition.
349349 pub fn read(self: *Self, buffer: []u8) Error!usize {
350 if (buffer.len == 0) return 0;
350351 const out = try self.get(buffer.len);
351352 @memcpy(buffer[0..out.len], out);
352353 return out.len;
......@@ -556,3 +557,14 @@ test "bug 18966" {
556557 try decompress(.gzip, in.reader(), out.writer());
557558 try testing.expectEqualStrings(expect, out.items);
558559}
560
561test "bug 19895" {
562 const input = &[_]u8{
563 0b0000_0001, 0b0000_1100, 0x00, 0b1111_0011, 0xff, // deflate fixed buffer header len, nlen
564 'H', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd', 0x0a, // non compressed data
565 };
566 var in = std.io.fixedBufferStream(input);
567 var decomp = decompressor(.raw, in.reader());
568 var buf: [0]u8 = undefined;
569 try testing.expectEqual(0, try decomp.read(&buf));
570}