ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix DEFLATE stored block handling.

Browse Source
This commit is contained in:
Jeroen van Rijn
2022-01-27 14:58:45 +01:00
parent fb86c23dbd
commit 28bc274449
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/compress/zlib/zlib.odin
+8 -5
View File
@@ -538,19 +538,20 @@ inflate_raw :: proc(z: ^$C, expected_output_size := -1, allocator := context.all
final = compress.read_bits_lsb(z, 1) final = compress.read_bits_lsb(z, 1)
type = compress.read_bits_lsb(z, 2) type = compress.read_bits_lsb(z, 2)
// fmt.printf("Final: %v | Type: %v\n", final, type); // fmt.printf("Final: %v | Type: %v\n", final, type)
switch type { switch type {
case 0: case 0:
// fmt.printf("Method 0: STORED\n")
// Uncompressed block // Uncompressed block
// Discard bits until next byte boundary // Discard bits until next byte boundary
compress.discard_to_next_byte_lsb(z) compress.discard_to_next_byte_lsb(z)
uncompressed_len := i16(compress.read_bits_lsb(z, 16)) uncompressed_len := u16(compress.read_bits_lsb(z, 16))
length_check := i16(compress.read_bits_lsb(z, 16)) length_check := u16(compress.read_bits_lsb(z, 16))
// fmt.printf("LEN: %v, ~LEN: %v, NLEN: %v, ~NLEN: %v\n", uncompressed_len, ~uncompressed_len, length_check, ~length_check); // fmt.printf("LEN: %v, ~LEN: %v, NLEN: %v, ~NLEN: %v\n", uncompressed_len, ~uncompressed_len, length_check, ~length_check)
if ~uncompressed_len != length_check { if ~uncompressed_len != length_check {
@@ -567,10 +568,12 @@ inflate_raw :: proc(z: ^$C, expected_output_size := -1, allocator := context.all
write_byte(z, u8(lit)) write_byte(z, u8(lit))
uncompressed_len -= 1 uncompressed_len -= 1
} }
assert(uncompressed_len == 0)
case 3: case 3:
return E_Deflate.BType_3 return E_Deflate.BType_3
case: case:
// log.debugf("Err: %v | Final: %v | Type: %v\n", err, final, type); // fmt.printf("Err: %v | Final: %v | Type: %v\n", err, final, type)
if type == 1 { if type == 1 {
// Use fixed code lengths. // Use fixed code lengths.
build_huffman(z_repeat, Z_FIXED_LENGTH[:]) or_return build_huffman(z_repeat, Z_FIXED_LENGTH[:]) or_return