authorgravatar for 4678790+dweiller@users.noreply.github.comDominic <4678790+dweiller@users.noreply.github.com> 2023-02-21 17:14:45+11:00
committergravatar for 4678790+dweiller@users.noreply.github.comDominic <4678790+dweiller@users.noreply.github.com> 2023-02-21 22:06:25+11:00
log32cf1d7cbf7852b7c66d1c026b0003690e9f7337
tree6c399b41522c1141261cd760d25b5ce6ee631134
parentc6ef83efe54bd19d7cd5dfadff23678d6af10de9

std.compress.zstandard: fix error sets for streaming API

2 files changed, 27 insertions(+), 7 deletions(-)

lib/std/compress/zstandard/decode/huffman.zig+23-5
......@@ -15,7 +15,12 @@ pub const Error = error{
1515 EndOfStream,
1616};
1717
18fn decodeFseHuffmanTree(source: anytype, compressed_size: usize, buffer: []u8, weights: *[256]u4) !usize {
18fn decodeFseHuffmanTree(
19 source: anytype,
20 compressed_size: usize,
21 buffer: []u8,
22 weights: *[256]u4,
23) !usize {
1924 var stream = std.io.limitedReader(source, compressed_size);
2025 var bit_reader = readers.bitReader(stream.reader());
2126
......@@ -23,6 +28,7 @@ fn decodeFseHuffmanTree(source: anytype, compressed_size: usize, buffer: []u8, w
2328 const table_size = decodeFseTable(&bit_reader, 256, 6, &entries) catch |err| switch (err) {
2429 error.MalformedAccuracyLog, error.MalformedFseTable => |e| return e,
2530 error.EndOfStream => return error.MalformedFseTable,
31 else => |e| return e,
2632 };
2733 const accuracy_log = std.math.log2_int_ceil(usize, table_size);
2834
......@@ -46,7 +52,8 @@ fn decodeFseHuffmanTreeSlice(src: []const u8, compressed_size: usize, weights: *
4652 };
4753 const accuracy_log = std.math.log2_int_ceil(usize, table_size);
4854
49 const start_index = std.math.cast(usize, counting_reader.bytes_read) orelse return error.MalformedHuffmanTree;
55 const start_index = std.math.cast(usize, counting_reader.bytes_read) orelse
56 return error.MalformedHuffmanTree;
5057 var huff_data = src[start_index..compressed_size];
5158 var huff_bits: readers.ReverseBitReader = undefined;
5259 huff_bits.init(huff_data) catch return error.MalformedHuffmanTree;
......@@ -54,7 +61,12 @@ fn decodeFseHuffmanTreeSlice(src: []const u8, compressed_size: usize, weights: *
5461 return assignWeights(&huff_bits, accuracy_log, &entries, weights);
5562}
5663
57fn assignWeights(huff_bits: *readers.ReverseBitReader, accuracy_log: usize, entries: *[1 << 6]Table.Fse, weights: *[256]u4) !usize {
64fn assignWeights(
65 huff_bits: *readers.ReverseBitReader,
66 accuracy_log: usize,
67 entries: *[1 << 6]Table.Fse,
68 weights: *[256]u4,
69) !usize {
5870 var i: usize = 0;
5971 var even_state: u32 = huff_bits.readBitsNoEof(u32, accuracy_log) catch return error.MalformedHuffmanTree;
6072 var odd_state: u32 = huff_bits.readBitsNoEof(u32, accuracy_log) catch return error.MalformedHuffmanTree;
......@@ -173,7 +185,10 @@ fn buildHuffmanTree(weights: *[256]u4, symbol_count: usize) error{MalformedHuffm
173185 return tree;
174186}
175187
176pub fn decodeHuffmanTree(source: anytype, buffer: []u8) !LiteralsSection.HuffmanTree {
188pub fn decodeHuffmanTree(
189 source: anytype,
190 buffer: []u8,
191) (@TypeOf(source).Error || Error)!LiteralsSection.HuffmanTree {
177192 const header = try source.readByte();
178193 var weights: [256]u4 = undefined;
179194 const symbol_count = if (header < 128)
......@@ -185,7 +200,10 @@ pub fn decodeHuffmanTree(source: anytype, buffer: []u8) !LiteralsSection.Huffman
185200 return buildHuffmanTree(&weights, symbol_count);
186201}
187202
188pub fn decodeHuffmanTreeSlice(src: []const u8, consumed_count: *usize) Error!LiteralsSection.HuffmanTree {
203pub fn decodeHuffmanTreeSlice(
204 src: []const u8,
205 consumed_count: *usize,
206) Error!LiteralsSection.HuffmanTree {
189207 if (src.len == 0) return error.MalformedHuffmanTree;
190208 const header = src[0];
191209 var bytes_read: usize = 1;
lib/std/compress/zstandard/decompress.zig+4-2
......@@ -64,7 +64,7 @@ pub const HeaderError = error{ BadMagic, EndOfStream, ReservedBitSet };
6464/// - `error.EndOfStream` if `source` contains fewer than 4 bytes
6565/// - `error.ReservedBitSet` if the frame is a Zstandard frame and any of the
6666/// reserved bits are set
67pub fn decodeFrameHeader(source: anytype) HeaderError!FrameHeader {
67pub fn decodeFrameHeader(source: anytype) (@TypeOf(source).Error || HeaderError)!FrameHeader {
6868 const magic = try source.readIntLittle(u32);
6969 const frame_type = try frameType(magic);
7070 switch (frame_type) {
......@@ -596,7 +596,9 @@ pub fn frameWindowSize(header: ZstandardHeader) ?u64 {
596596/// Errors returned:
597597/// - `error.ReservedBitSet` if any of the reserved bits of the header are set
598598/// - `error.EndOfStream` if `source` does not contain a complete header
599pub fn decodeZstandardHeader(source: anytype) error{ EndOfStream, ReservedBitSet }!ZstandardHeader {
599pub fn decodeZstandardHeader(
600 source: anytype,
601) (@TypeOf(source).Error || error{ EndOfStream, ReservedBitSet })!ZstandardHeader {
600602 const descriptor = @bitCast(ZstandardHeader.Descriptor, try source.readByte());
601603
602604 if (descriptor.reserved) return error.ReservedBitSet;