From 6980e93a76f4015520d2b2c739fce4abbae359a0 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 24 Dec 2020 23:22:48 +1100 Subject: [PATCH] Have std/png decode_frame handle multiple IDATs --- release/c/wuffs-unsupported-snapshot.c | 84 +++++++++++++++++++++++++- std/png/decode_png.wuffs | 15 ++++- 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 44a78443..a198a72c 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -8193,6 +8193,7 @@ extern "C" { // ---------------- Status Codes +extern const char wuffs_png__error__bad_chunk[]; extern const char wuffs_png__error__bad_header[]; extern const char wuffs_png__error__unsupported_png_file[]; @@ -8363,6 +8364,9 @@ struct wuffs_png__decoder__struct { uint32_t v_dst_pixfmt; uint64_t scratch; } s_decode_image_config[1]; + struct { + uint64_t scratch; + } s_decode_frame[1]; } private_data; #ifdef __cplusplus @@ -29791,8 +29795,10 @@ wuffs_zlib__decoder__transform_io( // ---------------- Status Codes Implementations +const char wuffs_png__error__bad_chunk[] = "#png: bad chunk"; const char wuffs_png__error__bad_header[] = "#png: bad header"; const char wuffs_png__error__unsupported_png_file[] = "#png: unsupported PNG file"; +const char wuffs_png__error__internal_error_zlib_decoder_did_not_exhaust_its_input[] = "#png: internal error: zlib decoder did not exhaust its input"; // ---------------- Private Consts @@ -30526,6 +30532,7 @@ wuffs_png__decoder__decode_frame( goto ok; } self->private_impl.f_workbuf_wi = 0; + label__0__continue:; while (true) { if ((self->private_impl.f_workbuf_wi > self->private_impl.f_workbuf_length) || (self->private_impl.f_workbuf_length > ((uint64_t)(a_workbuf.len)))) { status = wuffs_base__make_status(wuffs_base__error__bad_workbuf_length); @@ -30595,9 +30602,84 @@ wuffs_png__decoder__decode_frame( } goto ok; } else if (self->private_impl.f_chunk_length == 0) { + self->private_data.s_decode_frame[0].scratch = 4; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); + if (self->private_data.s_decode_frame[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) { + self->private_data.s_decode_frame[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src)); + iop_a_src = io2_a_src; + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + iop_a_src += self->private_data.s_decode_frame[0].scratch; + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); + uint64_t t_1; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { + t_1 = ((uint64_t)(wuffs_base__load_u32be__no_bounds_check(iop_a_src))); + iop_a_src += 4; + } else { + self->private_data.s_decode_frame[0].scratch = 0; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + while (true) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint64_t* scratch = &self->private_data.s_decode_frame[0].scratch; + uint32_t num_bits_1 = ((uint32_t)(*scratch & 0xFF)); + *scratch >>= 8; + *scratch <<= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1); + if (num_bits_1 == 24) { + t_1 = ((uint64_t)(*scratch >> 32)); + break; + } + num_bits_1 += 8; + *scratch |= ((uint64_t)(num_bits_1)); + } + } + self->private_impl.f_chunk_length = t_1; + } + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); + uint32_t t_2; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { + t_2 = wuffs_base__load_u32le__no_bounds_check(iop_a_src); + iop_a_src += 4; + } else { + self->private_data.s_decode_frame[0].scratch = 0; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); + while (true) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint64_t* scratch = &self->private_data.s_decode_frame[0].scratch; + uint32_t num_bits_2 = ((uint32_t)(*scratch >> 56)); + *scratch <<= 8; + *scratch >>= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_2; + if (num_bits_2 == 24) { + t_2 = ((uint32_t)(*scratch)); + break; + } + num_bits_2 += 8; + *scratch |= ((uint64_t)(num_bits_2)) << 56; + } + } + self->private_impl.f_chunk_type = t_2; + } + if (self->private_impl.f_chunk_type != 1413563465) { + status = wuffs_base__make_status(wuffs_png__error__bad_chunk); + goto exit; + } + goto label__0__continue; + } else if (((uint64_t)(io2_a_src - iop_a_src)) > 0) { + status = wuffs_base__make_status(wuffs_png__error__internal_error_zlib_decoder_did_not_exhaust_its_input); + goto exit; } status = wuffs_base__make_status(wuffs_base__suspension__short_read); - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7); } label__0__break:; if (self->private_impl.f_workbuf_wi != self->private_impl.f_workbuf_length) { diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index a40a7784..89b6ab51 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -15,9 +15,12 @@ use "std/crc32" use "std/zlib" +pub status "#bad chunk" pub status "#bad header" pub status "#unsupported PNG file" +pri status "#internal error: zlib decoder did not exhaust its input" + pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 pub struct decoder? implements base.image_decoder( @@ -266,7 +269,17 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader, } else if zlib_status <> base."$short read" { return zlib_status } else if this.chunk_length == 0 { - // TODO: move to the next IDAT. + // TODO: verify CRC-32 checksum. + args.src.skip_u32?(n: 4) + // The next chunk should be another IDAT. + this.chunk_length = args.src.read_u32be_as_u64?() + this.chunk_type = args.src.read_u32le?() + if this.chunk_type <> 'IDAT'le { + return "#bad chunk" + } + continue + } else if args.src.length() > 0 { + return "#internal error: zlib decoder did not exhaust its input" } yield? base."$short read" } endwhile