diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index bba27892..87a9889b 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -68557,16 +68557,19 @@ wuffs_xz__decoder__decode_block_header_sans_padding( } if (v_shift <= 56u) { self->private_impl.f_block_compressed_size |= (((uint64_t)(((uint8_t)(v_c8 & 127u)))) << v_shift); - if (v_c8 < 128u) { - break; + if (v_c8 >= 128u) { + v_shift += 7u; + continue; + } else if ((v_c8 == 0u) && (v_shift > 0u)) { + status = wuffs_base__make_status(wuffs_xz__error__bad_block_header); + goto exit; } - v_shift += 7u; - continue; - } else if (v_c8 > 1u) { + break; + } else if (v_c8 != 1u) { status = wuffs_base__make_status(wuffs_xz__error__bad_block_header); goto exit; } - self->private_impl.f_block_compressed_size |= (((uint64_t)(v_c8)) << 63u); + self->private_impl.f_block_compressed_size |= (((uint64_t)(1u)) << 63u); break; } } @@ -68586,16 +68589,19 @@ wuffs_xz__decoder__decode_block_header_sans_padding( } if (v_shift <= 56u) { self->private_impl.f_block_uncompressed_size |= (((uint64_t)(((uint8_t)(v_c8 & 127u)))) << v_shift); - if (v_c8 < 128u) { - break; + if (v_c8 >= 128u) { + v_shift += 7u; + continue; + } else if ((v_c8 == 0u) && (v_shift > 0u)) { + status = wuffs_base__make_status(wuffs_xz__error__bad_block_header); + goto exit; } - v_shift += 7u; - continue; - } else if (v_c8 > 1u) { + break; + } else if (v_c8 != 1u) { status = wuffs_base__make_status(wuffs_xz__error__bad_block_header); goto exit; } - self->private_impl.f_block_uncompressed_size |= (((uint64_t)(v_c8)) << 63u); + self->private_impl.f_block_uncompressed_size |= (((uint64_t)(1u)) << 63u); break; } } diff --git a/std/xz/decode_xz.wuffs b/std/xz/decode_xz.wuffs index 04240e14..11506e43 100644 --- a/std/xz/decode_xz.wuffs +++ b/std/xz/decode_xz.wuffs @@ -349,15 +349,17 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) { c8 = args.src.read_u8?() if shift <= 56 { this.block_compressed_size |= ((c8 & 0x7F) as base.u64) << shift - if c8 < 0x80 { - break + if c8 >= 0x80 { + shift += 7 + continue + } else if (c8 == 0x00) and (shift > 0) { + return "#bad block header" } - shift += 7 - continue - } else if c8 > 1 { + break + } else if c8 <> 1 { return "#bad block header" } - this.block_compressed_size |= (c8 as base.u64) << 63 + this.block_compressed_size |= (1 as base.u64) << 63 break } endwhile } @@ -371,15 +373,17 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) { c8 = args.src.read_u8?() if shift <= 56 { this.block_uncompressed_size |= ((c8 & 0x7F) as base.u64) << shift - if c8 < 0x80 { - break + if c8 >= 0x80 { + shift += 7 + continue + } else if (c8 == 0x00) and (shift > 0) { + return "#bad block header" } - shift += 7 - continue - } else if c8 > 1 { + break + } else if c8 <> 1 { return "#bad block header" } - this.block_uncompressed_size |= (c8 as base.u64) << 63 + this.block_uncompressed_size |= (1 as base.u64) << 63 break } endwhile } diff --git a/test/3pdata/mzcat-checksums-of-xzsuite.txt b/test/3pdata/mzcat-checksums-of-xzsuite.txt index ec68d340..dcb5e2cb 100644 --- a/test/3pdata/mzcat-checksums-of-xzsuite.txt +++ b/test/3pdata/mzcat-checksums-of-xzsuite.txt @@ -26,7 +26,6 @@ BAD 7759aecd test/3pdata/xzsuite/bad-1-lzma2-8.xz BAD 3b80e9ac test/3pdata/xzsuite/bad-1-lzma2-9.xz OK. 15a2a343 test/3pdata/xzsuite/bad-1-stream_flags-1.xz OK. 15a2a343 test/3pdata/xzsuite/bad-1-stream_flags-3.xz -OK. 15a2a343 test/3pdata/xzsuite/bad-1-vli-1.xz BAD 15a2a343 test/3pdata/xzsuite/bad-1-vli-2.xz BAD 31963516 test/3pdata/xzsuite/bad-2-compressed_data_padding.xz OK. 15a2a343 test/3pdata/xzsuite/bad-2-index-1.xz