diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 4cf339a1..34803613 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -441,6 +441,7 @@ typedef struct { wuffs_deflate__decoder f_flate; wuffs_zlib__adler32 f_adler; + bool f_ignore_checksum; struct { uint32_t coro_susp_point; @@ -465,6 +466,9 @@ void wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self, // ---------------- Public Function Prototypes +void wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, + bool a_ic); + wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, wuffs_base__writer1 a_dst, wuffs_base__reader1 a_src); @@ -937,6 +941,21 @@ void wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self, // ---------------- Function Implementations +void wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, + bool a_ic) { + if (!self) { + return; + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + self->private_impl.status = WUFFS_ZLIB__ERROR_INITIALIZER_NOT_CALLED; + } + if (self->private_impl.status < 0) { + return; + } + + self->private_impl.f_ignore_checksum = a_ic; +} + wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, wuffs_base__writer1 a_dst, wuffs_base__reader1 a_src) { @@ -1077,14 +1096,16 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, } v_z = t_2; } - v_checksum = wuffs_zlib__adler32__update( - &self->private_impl.f_adler, - ((wuffs_base__slice_u8){ - .ptr = a_dst.private_impl.mark, - .len = a_dst.private_impl.mark - ? (size_t)(b_wptr_dst - a_dst.private_impl.mark) - : 0, - })); + if (!self->private_impl.f_ignore_checksum) { + v_checksum = wuffs_zlib__adler32__update( + &self->private_impl.f_adler, + ((wuffs_base__slice_u8){ + .ptr = a_dst.private_impl.mark, + .len = a_dst.private_impl.mark + ? (size_t)(b_wptr_dst - a_dst.private_impl.mark) + : 0, + })); + } if (v_z == 0) { goto label_0_break; } @@ -1117,7 +1138,7 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, self->private_impl.c_decode[0].scratch |= ((uint64_t)(t_3)); } } - if (v_checksum != t_4) { + if (!self->private_impl.f_ignore_checksum && (v_checksum != t_4)) { status = WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH; goto exit; } diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index 7ba0b142..322fbdc1 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -441,6 +441,7 @@ typedef struct { wuffs_deflate__decoder f_flate; wuffs_zlib__adler32 f_adler; + bool f_ignore_checksum; struct { uint32_t coro_susp_point; @@ -465,6 +466,9 @@ void wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self, // ---------------- Public Function Prototypes +void wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, + bool a_ic); + wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, wuffs_base__writer1 a_dst, wuffs_base__reader1 a_src); diff --git a/std/zlib/decode_zlib.wuffs b/std/zlib/decode_zlib.wuffs index 13e7ecdc..a1d78fde 100644 --- a/std/zlib/decode_zlib.wuffs +++ b/std/zlib/decode_zlib.wuffs @@ -26,8 +26,13 @@ pub error "TODO: unsupported zlib preset dictionary" pub struct decoder?( flate deflate.decoder, adler adler32, + ignore_checksum bool, ) +pub func decoder.set_ignore_checksum!(ic bool)() { + this.ignore_checksum = in.ic +} + pub func decoder.decode?(dst writer1, src reader1)() { var x u16 = in.src.read_u16be?() if ((x >> 8) & 0x0F) != 0x08 { @@ -46,15 +51,15 @@ pub func decoder.decode?(dst writer1, src reader1)() { while true { in.dst.mark() var z status = try this.flate.decode?(dst:in.dst, src:in.src) - // TODO: expose some API to opt out of checksumming, trading off error - // detection for throughput. - checksum = this.adler.update(x:in.dst.since_mark()) + if not this.ignore_checksum { + checksum = this.adler.update(x:in.dst.since_mark()) + } if z.is_ok() { break } yield z } - if checksum != in.src.read_u32be?() { + if (not this.ignore_checksum) and (checksum != in.src.read_u32be?()) { return error "checksum mismatch" } } diff --git a/test/c/std/zlib.c b/test/c/std/zlib.c index 2beb9c21..754a9842 100644 --- a/test/c/std/zlib.c +++ b/test/c/std/zlib.c @@ -180,36 +180,48 @@ const char* wuffs_zlib_decode(wuffs_base__buf1* dst, } } -void test_wuffs_zlib_checksum_mismatch() { - CHECK_FOCUS(__func__); - +bool do_test_wuffs_zlib_checksum(bool ignore_checksum) { wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE}; wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE}; if (!read_file(&src, zlib_midsummer_gt.src_filename)) { - return; + return false; } if (src.wi == 0) { FAIL("source file was empty"); - return; + return false; } // Flip a bit in the zlib checksum, which comes at the end of the file. src.ptr[src.wi - 1] ^= 1; wuffs_zlib__decoder dec; wuffs_zlib__decoder__initialize(&dec, WUFFS_VERSION, 0); + wuffs_zlib__decoder__set_ignore_checksum(&dec, ignore_checksum); wuffs_base__writer1 got_writer = {.buf = &got}; wuffs_base__reader1 src_reader = {.buf = &src}; wuffs_zlib__status status = wuffs_zlib__decoder__decode(&dec, got_writer, src_reader); - if (status != WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH) { + wuffs_zlib__status want = ignore_checksum + ? WUFFS_ZLIB__STATUS_OK + : WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH; + if (status != want) { FAIL("decode: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status, - wuffs_zlib__status__string(status), - WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH, - wuffs_zlib__status__string(WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH)); - return; + wuffs_zlib__status__string(status), want, + wuffs_zlib__status__string(want)); + return false; } + return true; +} + +void test_wuffs_zlib_checksum_ignore() { + CHECK_FOCUS(__func__); + do_test_wuffs_zlib_checksum(true); +} + +void test_wuffs_zlib_checksum_verify() { + CHECK_FOCUS(__func__); + do_test_wuffs_zlib_checksum(false); } void test_wuffs_zlib_decode_midsummer() { @@ -322,9 +334,10 @@ proc tests[] = { test_wuffs_adler32, // - test_wuffs_zlib_checksum_mismatch, // - test_wuffs_zlib_decode_midsummer, // - test_wuffs_zlib_decode_pi, // + test_wuffs_zlib_checksum_ignore, // + test_wuffs_zlib_checksum_verify, // + test_wuffs_zlib_decode_midsummer, // + test_wuffs_zlib_decode_pi, // #ifdef WUFFS_MIMIC