From dfe5bcd36eafd8d250ab9433414215f04ef47afb Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 26 Aug 2023 12:30:21 +1000 Subject: [PATCH] std/jpeg: decode something for truncated input --- release/c/wuffs-unsupported-snapshot.c | 16 +++++----------- std/jpeg/decode_jpeg.wuffs | 14 ++++++-------- test/3pdata/nia-checksums-of-blinksuite.txt | 4 ++-- test/nia-checksums-of-data.txt | 2 +- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 4e06844b..5369693a 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -39344,7 +39344,6 @@ WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status wuffs_jpeg__decoder__decode_sos( wuffs_jpeg__decoder* self, - wuffs_base__pixel_buffer* a_dst, wuffs_base__io_buffer* a_src, wuffs_base__slice_u8 a_workbuf); @@ -42442,10 +42441,10 @@ wuffs_jpeg__decoder__decode_frame( a_opts); v_ddf_status = t_0; } - if (wuffs_base__status__is_error(&v_ddf_status)) { - status = v_ddf_status; - goto exit; - } else if (v_scan_count < self->private_impl.f_scan_count) { + if ((v_ddf_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) { + v_ddf_status = wuffs_base__make_status(wuffs_jpeg__error__truncated_input); + } + if (wuffs_base__status__is_error(&v_ddf_status) || (v_scan_count < self->private_impl.f_scan_count)) { if (self->private_impl.f_sof_marker >= 194u) { wuffs_jpeg__decoder__apply_progressive_idct(self, a_workbuf); } @@ -42459,10 +42458,6 @@ wuffs_jpeg__decoder__decode_frame( goto exit; } } - if ((v_ddf_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) { - status = wuffs_base__make_status(wuffs_jpeg__error__truncated_input); - goto exit; - } status = v_ddf_status; WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1); } @@ -42673,7 +42668,7 @@ wuffs_jpeg__decoder__do_decode_frame( a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); - status = wuffs_jpeg__decoder__decode_sos(self, a_dst, a_src, a_workbuf); + status = wuffs_jpeg__decoder__decode_sos(self, a_src, a_workbuf); if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; } @@ -43022,7 +43017,6 @@ WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status wuffs_jpeg__decoder__decode_sos( wuffs_jpeg__decoder* self, - wuffs_base__pixel_buffer* a_dst, wuffs_base__io_buffer* a_src, wuffs_base__slice_u8 a_workbuf) { wuffs_base__status status = wuffs_base__make_status(NULL); diff --git a/std/jpeg/decode_jpeg.wuffs b/std/jpeg/decode_jpeg.wuffs index 5534b2f7..7a4e695a 100644 --- a/std/jpeg/decode_jpeg.wuffs +++ b/std/jpeg/decode_jpeg.wuffs @@ -876,10 +876,11 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader, while true { scan_count = this.scan_count ddf_status =? this.do_decode_frame?(dst: args.dst, src: args.src, blend: args.blend, workbuf: args.workbuf, opts: args.opts) - if ddf_status.is_error() { - return ddf_status + if (ddf_status == base."$short read") and args.src.is_closed() { + ddf_status = "#truncated input" + } - } else if scan_count < this.scan_count { + if ddf_status.is_error() or (scan_count < this.scan_count) { if this.sof_marker >= 0xC2 { this.apply_progressive_idct!(workbuf: args.workbuf) } @@ -894,9 +895,6 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader, } } - if (ddf_status == base."$short read") and args.src.is_closed() { - return "#truncated input" - } yield? ddf_status } endwhile } @@ -1008,7 +1006,7 @@ pri func decoder.do_decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reade break } else if marker == 0xDA { // SOS (Start Of Scan). - this.decode_sos?(dst: args.dst, src: args.src, workbuf: args.workbuf) + this.decode_sos?(src: args.src, workbuf: args.workbuf) continue } else if marker == 0xDB { // DQT (Define Quantization Table). @@ -1249,7 +1247,7 @@ pri func decoder.calculate_huff_tables!(tc4_th: base.u8[..= 7], total_count: bas return false } -pri func decoder.decode_sos?(dst: ptr base.pixel_buffer, src: base.io_reader, workbuf: slice base.u8) { +pri func decoder.decode_sos?(src: base.io_reader, workbuf: slice base.u8) { var my : base.u32 var mx : base.u32 diff --git a/test/3pdata/nia-checksums-of-blinksuite.txt b/test/3pdata/nia-checksums-of-blinksuite.txt index 69a44e92..8285523d 100644 --- a/test/3pdata/nia-checksums-of-blinksuite.txt +++ b/test/3pdata/nia-checksums-of-blinksuite.txt @@ -6,7 +6,7 @@ 1f0a869f test/3pdata/blinksuite/2-dht.jpg d7865c25 test/3pdata/blinksuite/23-55.jpg 361f7557 test/3pdata/blinksuite/5000x5000.png -73d0d385 test/3pdata/blinksuite/55.jpg +4920fb2a test/3pdata/blinksuite/55.jpg e2c0805a test/3pdata/blinksuite/57.jpg 1542e2e1 test/3pdata/blinksuite/58.jpg da174c34 test/3pdata/blinksuite/59.jpg @@ -94,7 +94,7 @@ f37cea44 test/3pdata/blinksuite/icc-v2-gbr-422-whole-mcus.jpg 2f310e57 test/3pdata/blinksuite/missing-eoi.jpg 72bbe2b6 test/3pdata/blinksuite/motion-jpeg-single-frame.jpg 0268284a test/3pdata/blinksuite/mu.png -263cb2b3 test/3pdata/blinksuite/non-interleaved_progressive-1.jpg +0c20dd5a test/3pdata/blinksuite/non-interleaved_progressive-1.jpg 5265140a test/3pdata/blinksuite/non-interleaved_progressive.jpg 96a8bcfd test/3pdata/blinksuite/oval.png 918aa35f test/3pdata/blinksuite/palatted-color-png-gamma-one-color-profile.png diff --git a/test/nia-checksums-of-data.txt b/test/nia-checksums-of-data.txt index 0c0e3174..8a700eb1 100644 --- a/test/nia-checksums-of-data.txt +++ b/test/nia-checksums-of-data.txt @@ -82,7 +82,7 @@ dcbb225a test/data/hippopotamus.regular.png db2733f5 test/data/muybridge.apng db2733f5 test/data/muybridge.gif d42a13cd test/data/peacock.default.jpeg -9154cd54 test/data/peacock.default.truncated.jpeg +3fa7f01b test/data/peacock.default.truncated.jpeg d49bab2d test/data/peacock.grayscale.jpeg d42a13cd test/data/peacock.optimize.jpeg bdf8cc70 test/data/peacock.png