diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index c50939d5..b0fdbef5 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -13935,13 +13935,18 @@ struct wuffs_xz__decoder__struct { struct { uint32_t v_checksum32_have; wuffs_base__bitvec256 v_checksum256_have; - uint32_t v_padding; + uint64_t v_compressed_size; + uint64_t v_uncompressed_size; uint64_t scratch; } s_do_transform_io; struct { uint64_t v_padded_size_have; uint64_t v_padded_size_want; } s_decode_block_header_with_padding; + struct { + uint8_t v_flags; + uint32_t v_shift; + } s_decode_block_header_sans_padding; } private_data; #ifdef __cplusplus @@ -66547,7 +66552,6 @@ const char wuffs_xz__error__truncated_input[] = "#xz: truncated input"; const char wuffs_xz__error__unsupported_checksum_algorithm[] = "#xz: unsupported checksum algorithm"; const char wuffs_xz__error__unsupported_filter[] = "#xz: unsupported filter"; const char wuffs_xz__error__unsupported_number_of_filters[] = "#xz: unsupported number of filters"; -const char wuffs_xz__error__todo[] = "#xz: TODO"; // ---------------- Private Consts @@ -66858,7 +66862,8 @@ wuffs_xz__decoder__do_transform_io( uint64_t v_checksum64_have = 0; uint64_t v_checksum64_want = 0; wuffs_base__bitvec256 v_checksum256_have = {0}; - uint32_t v_padding = 0; + uint64_t v_compressed_size = 0; + uint64_t v_uncompressed_size = 0; uint8_t v_c8 = 0; uint8_t* iop_a_dst = NULL; @@ -66889,7 +66894,8 @@ wuffs_xz__decoder__do_transform_io( if (coro_susp_point) { v_checksum32_have = self->private_data.s_do_transform_io.v_checksum32_have; v_checksum256_have = self->private_data.s_do_transform_io.v_checksum256_have; - v_padding = self->private_data.s_do_transform_io.v_padding; + v_compressed_size = self->private_data.s_do_transform_io.v_compressed_size; + v_uncompressed_size = self->private_data.s_do_transform_io.v_uncompressed_size; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -67054,6 +67060,8 @@ wuffs_xz__decoder__do_transform_io( wuffs_private_impl__ignore_status(wuffs_sha256__hasher__initialize(&self->private_data.f_sha256, sizeof (wuffs_sha256__hasher), WUFFS_VERSION, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); } + v_compressed_size = 0u; + v_uncompressed_size = 0u; while (true) { v_dmark = ((uint64_t)(iop_a_dst - io0_a_dst)); v_smark = ((uint64_t)(iop_a_src - io0_a_src)); @@ -67073,7 +67081,8 @@ wuffs_xz__decoder__do_transform_io( iop_a_src = a_src->data.ptr + a_src->meta.ri; } } - v_padding += ((uint32_t)(wuffs_private_impl__io__count_since(v_smark, ((uint64_t)(iop_a_src - io0_a_src))))); + v_compressed_size += wuffs_private_impl__io__count_since(v_smark, ((uint64_t)(iop_a_src - io0_a_src))); + v_uncompressed_size += wuffs_private_impl__io__count_since(v_dmark, ((uint64_t)(iop_a_dst - io0_a_dst))); if (self->private_impl.f_ignore_checksum) { } else if (self->private_impl.f_checksummer == 1u) { wuffs_crc32__ieee_hasher__update(&self->private_data.f_crc32, wuffs_private_impl__io__since(v_dmark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst)); @@ -67088,7 +67097,11 @@ wuffs_xz__decoder__do_transform_io( status = v_status; WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9); } - while ((v_padding & 3u) != 0u) { + if ((self->private_impl.f_block_has_compressed_size && (self->private_impl.f_block_compressed_size != v_compressed_size)) || (self->private_impl.f_block_has_uncompressed_size && (self->private_impl.f_block_uncompressed_size != v_uncompressed_size))) { + status = wuffs_base__make_status(wuffs_xz__error__bad_block_header); + goto exit; + } + while ((v_compressed_size & 3u) != 0u) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10); if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { @@ -67102,7 +67115,7 @@ wuffs_xz__decoder__do_transform_io( status = wuffs_base__make_status(wuffs_xz__error__bad_padding); goto exit; } - v_padding += 1u; + v_compressed_size += 1u; } if (self->private_impl.f_ignore_checksum) { } else if (self->private_impl.f_checksummer == 1u) { @@ -67322,7 +67335,8 @@ wuffs_xz__decoder__do_transform_io( self->private_impl.p_do_transform_io = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0; self->private_data.s_do_transform_io.v_checksum32_have = v_checksum32_have; self->private_data.s_do_transform_io.v_checksum256_have = v_checksum256_have; - self->private_data.s_do_transform_io.v_padding = v_padding; + self->private_data.s_do_transform_io.v_compressed_size = v_compressed_size; + self->private_data.s_do_transform_io.v_uncompressed_size = v_uncompressed_size; goto exit; exit: @@ -67453,6 +67467,7 @@ wuffs_xz__decoder__decode_block_header_sans_padding( uint8_t v_flags = 0; uint8_t v_filter_id = 0; wuffs_base__status v_status = wuffs_base__make_status(NULL); + uint32_t v_shift = 0; const uint8_t* iop_a_src = NULL; const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; @@ -67466,6 +67481,10 @@ wuffs_xz__decoder__decode_block_header_sans_padding( } uint32_t coro_susp_point = self->private_impl.p_decode_block_header_sans_padding; + if (coro_susp_point) { + v_flags = self->private_data.s_decode_block_header_sans_padding.v_flags; + v_shift = self->private_data.s_decode_block_header_sans_padding.v_shift; + } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -67489,26 +67508,37 @@ wuffs_xz__decoder__decode_block_header_sans_padding( self->private_impl.f_block_has_compressed_size = (((uint8_t)(v_flags & 64u)) != 0u); if (self->private_impl.f_block_has_compressed_size) { self->private_impl.f_block_compressed_size = 0u; - status = wuffs_base__make_status(wuffs_xz__error__todo); - goto exit; + v_shift = 0u; + while (true) { + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint8_t t_1 = *iop_a_src++; + v_c8 = t_1; + } + 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; + } + v_shift += 7u; + continue; + } 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); + break; + } } self->private_impl.f_block_has_uncompressed_size = (((uint8_t)(v_flags & 128u)) != 0u); if (self->private_impl.f_block_has_uncompressed_size) { self->private_impl.f_block_uncompressed_size = 0u; - status = wuffs_base__make_status(wuffs_xz__error__todo); - goto exit; - } - while (true) { - { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { - status = wuffs_base__make_status(wuffs_base__suspension__short_read); - goto suspend; - } - uint8_t t_1 = *iop_a_src++; - v_filter_id = t_1; - } - if (v_filter_id == 33u) { + v_shift = 0u; + while (true) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { @@ -67518,18 +67548,53 @@ wuffs_xz__decoder__decode_block_header_sans_padding( uint8_t t_2 = *iop_a_src++; v_c8 = t_2; } + 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; + } + v_shift += 7u; + continue; + } 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); + break; + } + } + while (true) { + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint8_t t_3 = *iop_a_src++; + v_filter_id = t_3; + } + if (v_filter_id == 33u) { + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint8_t t_4 = *iop_a_src++; + v_c8 = t_4; + } if (v_c8 != 1u) { status = wuffs_base__make_status(wuffs_xz__error__bad_block_header); goto exit; } { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__make_status(wuffs_base__suspension__short_read); goto suspend; } - uint8_t t_3 = *iop_a_src++; - v_c8 = t_3; + uint8_t t_5 = *iop_a_src++; + v_c8 = t_5; } v_status = wuffs_lzma__decoder__set_quirk(&self->private_data.f_lzma, 1348001792u, (2u | (((uint64_t)(v_c8)) << 8u))); if ( ! wuffs_base__status__is_ok(&v_status)) { @@ -67551,6 +67616,8 @@ wuffs_xz__decoder__decode_block_header_sans_padding( goto suspend; suspend: self->private_impl.p_decode_block_header_sans_padding = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0; + self->private_data.s_decode_block_header_sans_padding.v_flags = v_flags; + self->private_data.s_decode_block_header_sans_padding.v_shift = v_shift; goto exit; exit: diff --git a/std/xz/decode_xz.wuffs b/std/xz/decode_xz.wuffs index 909718fd..411493a2 100644 --- a/std/xz/decode_xz.wuffs +++ b/std/xz/decode_xz.wuffs @@ -26,8 +26,6 @@ pub status "#unsupported checksum algorithm" pub status "#unsupported filter" pub status "#unsupported number of filters" -pri status "#TODO" - pub const DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0xFFFF_FFFF pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 @@ -94,17 +92,18 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf } pri func decoder.do_transform_io?(dst: base.io_writer, src: base.io_reader, workbuf: slice base.u8) { - var magic : base.u64 - var dmark : base.u64 - var smark : base.u64 - var status : base.status - var checksum32_have : base.u32 - var checksum32_want : base.u32 - var checksum64_have : base.u64 - var checksum64_want : base.u64 - var checksum256_have : base.bitvec256 - var padding : base.u32 - var c8 : base.u8 + var magic : base.u64 + var dmark : base.u64 + var smark : base.u64 + var status : base.status + var checksum32_have : base.u32 + var checksum32_want : base.u32 + var checksum64_have : base.u64 + var checksum64_want : base.u64 + var checksum256_have : base.bitvec256 + var compressed_size : base.u64 + var uncompressed_size : base.u64 + var c8 : base.u8 magic = args.src.read_u48le_as_u64?() if magic <> '\xFD\x37\x7A\x58\x5A\x00'le { @@ -170,11 +169,14 @@ pri func decoder.do_transform_io?(dst: base.io_writer, src: base.io_reader, work this.sha256.reset!() } + compressed_size = 0 + uncompressed_size = 0 while true { dmark = args.dst.mark() smark = args.src.mark() status =? this.lzma.transform_io?(dst: args.dst, src: args.src, workbuf: this.util.empty_slice_u8()) - padding ~mod+= (args.src.count_since(mark: smark) & 0xFFFF_FFFF) as base.u32 + compressed_size ~mod+= args.src.count_since(mark: smark) + uncompressed_size ~mod+= args.dst.count_since(mark: dmark) // TODO: apply any filters that aren't LZMA2. @@ -193,12 +195,17 @@ pri func decoder.do_transform_io?(dst: base.io_writer, src: base.io_reader, work yield? status } endwhile - while (padding & 3) <> 0 { + if (this.block_has_compressed_size and (this.block_compressed_size <> compressed_size)) or + (this.block_has_uncompressed_size and (this.block_uncompressed_size <> uncompressed_size)) { + return "#bad block header" + } + + while (compressed_size & 3) <> 0 { c8 = args.src.read_u8?() if c8 <> 0x00 { return "#bad padding" } - padding ~mod+= 1 + compressed_size ~mod+= 1 } endwhile if this.ignore_checksum { @@ -277,6 +284,7 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) { var flags : base.u8 var filter_id : base.u8 var status : base.status + var shift : base.u32 flags = args.src.read_u8?() if (flags & 0x03) <> 0 { @@ -289,14 +297,46 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) { this.block_has_compressed_size = (flags & 0x40) <> 0 if this.block_has_compressed_size { + // Read a uvarint (Unsigned LEB128) as this.block_compressed_size. this.block_compressed_size = 0 - return "#TODO" + shift = 0 + while true { + c8 = args.src.read_u8?() + if shift <= 56 { + this.block_compressed_size |= ((c8 & 0x7F) as base.u64) << shift + if c8 < 0x80 { + break + } + shift += 7 + continue + } else if c8 > 1 { + return "#bad block header" + } + this.block_compressed_size |= (c8 as base.u64) << 63 + break + } endwhile } this.block_has_uncompressed_size = (flags & 0x80) <> 0 if this.block_has_uncompressed_size { + // Read a uvarint (Unsigned LEB128) as this.block_uncompressed_size. this.block_uncompressed_size = 0 - return "#TODO" + shift = 0 + while true { + c8 = args.src.read_u8?() + if shift <= 56 { + this.block_uncompressed_size |= ((c8 & 0x7F) as base.u64) << shift + if c8 < 0x80 { + break + } + shift += 7 + continue + } else if c8 > 1 { + return "#bad block header" + } + this.block_uncompressed_size |= (c8 as base.u64) << 63 + break + } endwhile } while true { diff --git a/test/3pdata/mzcat-checksums-of-xzsuite.txt b/test/3pdata/mzcat-checksums-of-xzsuite.txt index f93c5e76..8f8f463b 100644 --- a/test/3pdata/mzcat-checksums-of-xzsuite.txt +++ b/test/3pdata/mzcat-checksums-of-xzsuite.txt @@ -1,8 +1,13 @@ # Generated by script/print-mzcat-checksums.sh +15a2a343 test/3pdata/xzsuite/bad-1-block_header-4.xz +15a2a343 test/3pdata/xzsuite/bad-1-block_header-5.xz +15a2a343 test/3pdata/xzsuite/bad-1-check-crc32-2.xz 15a2a343 test/3pdata/xzsuite/bad-1-check-crc32.xz 15a2a343 test/3pdata/xzsuite/bad-1-check-crc64.xz 15a2a343 test/3pdata/xzsuite/bad-1-check-sha256.xz 15a2a343 test/3pdata/xzsuite/bad-1-lzma2-1.xz +a3de2f0d test/3pdata/xzsuite/bad-1-lzma2-10.xz +7d14dddd test/3pdata/xzsuite/bad-1-lzma2-11.xz 7759aecd test/3pdata/xzsuite/bad-1-lzma2-2.xz 7759aecd test/3pdata/xzsuite/bad-1-lzma2-3.xz 6fcaba82 test/3pdata/xzsuite/bad-1-lzma2-4.xz @@ -10,8 +15,11 @@ 31963516 test/3pdata/xzsuite/bad-1-lzma2-6.xz db4847fb test/3pdata/xzsuite/bad-1-lzma2-7.xz 7759aecd test/3pdata/xzsuite/bad-1-lzma2-8.xz +3b80e9ac test/3pdata/xzsuite/bad-1-lzma2-9.xz 15a2a343 test/3pdata/xzsuite/bad-1-stream_flags-1.xz 15a2a343 test/3pdata/xzsuite/bad-1-stream_flags-3.xz +15a2a343 test/3pdata/xzsuite/bad-1-vli-1.xz +15a2a343 test/3pdata/xzsuite/bad-1-vli-2.xz 31963516 test/3pdata/xzsuite/bad-2-compressed_data_padding.xz 15a2a343 test/3pdata/xzsuite/bad-2-index-1.xz 15a2a343 test/3pdata/xzsuite/bad-2-index-2.xz @@ -24,6 +32,9 @@ db4847fb test/3pdata/xzsuite/bad-1-lzma2-7.xz dd46b7fb test/3pdata/xzsuite/bad-too_small_size-without_eopm-2.lzma bdc79ef1 test/3pdata/xzsuite/bad-too_small_size-without_eopm-3.lzma 15a2a343 test/3pdata/xzsuite/bad-unknown_size-without_eopm.lzma +15a2a343 test/3pdata/xzsuite/good-1-block_header-1.xz +15a2a343 test/3pdata/xzsuite/good-1-block_header-2.xz +15a2a343 test/3pdata/xzsuite/good-1-block_header-3.xz 15a2a343 test/3pdata/xzsuite/good-1-check-crc32.xz 15a2a343 test/3pdata/xzsuite/good-1-check-crc64.xz 15a2a343 test/3pdata/xzsuite/good-1-check-none.xz