diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index c8f12bc7..6631c088 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -6944,6 +6944,7 @@ struct wuffs_bzip2__decoder__struct { uint32_t f_flush_pointer; uint32_t f_flush_repeat_count; uint8_t f_flush_prev; + bool f_ignore_checksum; uint32_t f_final_checksum_have; uint32_t f_block_checksum_have; uint32_t f_block_checksum_want; @@ -25054,6 +25055,16 @@ wuffs_bzip2__decoder__set_quirk_enabled( wuffs_bzip2__decoder* self, uint32_t a_quirk, bool a_enabled) { + if (!self) { + return wuffs_base__make_empty_struct(); + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + return wuffs_base__make_empty_struct(); + } + + if (a_quirk == 1) { + self->private_impl.f_ignore_checksum = a_enabled; + } return wuffs_base__make_empty_struct(); } @@ -25276,7 +25287,7 @@ wuffs_bzip2__decoder__transform_io( } label__2__break:; self->private_impl.f_block_checksum_have ^= 4294967295; - if (self->private_impl.f_block_checksum_have != self->private_impl.f_block_checksum_want) { + if ( ! self->private_impl.f_ignore_checksum && (self->private_impl.f_block_checksum_have != self->private_impl.f_block_checksum_want)) { status = wuffs_base__make_status(wuffs_bzip2__error__bad_checksum); goto exit; } @@ -25305,7 +25316,7 @@ wuffs_bzip2__decoder__transform_io( self->private_impl.f_n_bits -= 1; v_i += 1; } - if (self->private_impl.f_final_checksum_have != v_final_checksum_want) { + if ( ! self->private_impl.f_ignore_checksum && (self->private_impl.f_final_checksum_have != v_final_checksum_want)) { status = wuffs_base__make_status(wuffs_bzip2__error__bad_checksum); goto exit; } diff --git a/std/bzip2/decode_bzip2.wuffs b/std/bzip2/decode_bzip2.wuffs index 889c4dd1..ed3de897 100644 --- a/std/bzip2/decode_bzip2.wuffs +++ b/std/bzip2/decode_bzip2.wuffs @@ -47,6 +47,7 @@ pub struct decoder? implements base.io_transformer( flush_repeat_count : base.u32[..= 255], flush_prev : base.u8, + ignore_checksum : base.bool, final_checksum_have : base.u32, block_checksum_have : base.u32, block_checksum_want : base.u32, @@ -100,8 +101,9 @@ pub struct decoder? implements base.io_transformer( ) pub func decoder.set_quirk_enabled!(quirk: base.u32, enabled: base.bool) { - // We do not support base.QUIRK_IGNORE_CHECKSUM. Benchmarks suggest that - // checksum calculation has an insignificant effect on performance. + if args.quirk == base.QUIRK_IGNORE_CHECKSUM { + this.ignore_checksum = args.enabled + } } pub func decoder.workbuf_len() base.range_ii_u64 { @@ -198,7 +200,7 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf } endwhile this.block_checksum_have ^= 0xFFFF_FFFF - if this.block_checksum_have <> this.block_checksum_want { + if (not this.ignore_checksum) and (this.block_checksum_have <> this.block_checksum_want) { return "#bad checksum" } this.final_checksum_have = this.block_checksum_have ^ ( @@ -222,7 +224,7 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf this.n_bits -= 1 i += 1 } endwhile - if this.final_checksum_have <> final_checksum_want { + if (not this.ignore_checksum) and (this.final_checksum_have <> final_checksum_want) { return "#bad checksum" } }