From 39a01cdc6452a62716a69e52a61a88ef6db4e398 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 22 Dec 2018 16:51:46 +1100 Subject: [PATCH] Flush std/gif when paused on the next block size --- release/c/wuffs-unsupported-snapshot.c | 59 +++++++++++++++----------- std/gif/decode_gif.wuffs | 21 +++++++-- test/c/std/gif.c | 55 ++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 28 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 58b7e1ca..748aa702 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -2855,6 +2855,7 @@ struct wuffs_gif__decoder__struct { uint32_t v_num_palette_entries; uint32_t v_i; uint64_t v_block_size; + bool v_need_block_size; wuffs_base__status v_z; uint64_t scratch; } c_decode_id_part1[1]; @@ -9269,6 +9270,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, wuffs_base__slice_u8 v_dst_palette; uint8_t v_lw; uint64_t v_block_size; + bool v_need_block_size; uint64_t v_n_compressed; wuffs_base__slice_u8 v_compressed; wuffs_base__io_reader v_r; @@ -9309,6 +9311,8 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, v_dst_palette = ((wuffs_base__slice_u8){}); v_lw = 0; v_block_size = self->private_impl.c_decode_id_part1[0].v_block_size; + v_need_block_size = + self->private_impl.c_decode_id_part1[0].v_need_block_size; v_n_compressed = 0; v_compressed = ((wuffs_base__slice_u8){}); v_r = ((wuffs_base__io_reader){}); @@ -9316,6 +9320,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, v_uncompressed = ((wuffs_base__slice_u8){}); } else { v_dst_palette = ((wuffs_base__slice_u8){}); + v_need_block_size = false; v_compressed = ((wuffs_base__slice_u8){}); v_r = ((wuffs_base__io_reader){}); v_uncompressed = ((wuffs_base__slice_u8){}); @@ -9457,17 +9462,25 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, wuffs_lzw__decoder__set_literal_width(&self->private_impl.f_lzw, ((uint32_t)(v_lw))); self->private_impl.f_previous_lzw_decode_ended_abruptly = true; - { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { - status = wuffs_base__suspension__short_read; - goto suspend; - } - uint64_t t_3 = *iop_a_src++; - v_block_size = t_3; - } + v_block_size = 0; + v_need_block_size = true; label_0_continue:; - while (v_block_size > 0) { + while (true) { + if (v_need_block_size) { + v_need_block_size = false; + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); + if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { + status = wuffs_base__suspension__short_read; + goto suspend; + } + uint64_t t_3 = *iop_a_src++; + v_block_size = t_3; + } + } + if (v_block_size == 0) { + goto label_0_break; + } while (((uint64_t)(io1_a_src - iop_a_src)) == 0) { status = wuffs_base__suspension__short_read; WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6); @@ -9499,15 +9512,12 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, if (v_block_size > 0) { goto label_1_break; } - { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { - status = wuffs_base__suspension__short_read; - goto suspend; - } - uint64_t t_4 = *iop_a_src++; - v_block_size = t_4; + if (((uint64_t)(io1_a_src - iop_a_src)) <= 0) { + v_need_block_size = true; + goto label_1_break; } + v_block_size = wuffs_base__load_u8be(iop_a_src); + (iop_a_src += 1, wuffs_base__return_empty_struct()); } label_1_break:; if (((uint64_t)(self->private_impl.f_width)) < @@ -9543,12 +9553,12 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, self->private_impl.f_compressed_wi)); { u_r.meta.ri = iop_v_r - u_r.data.ptr; - wuffs_base__status t_5 = wuffs_lzw__decoder__decode( + wuffs_base__status t_4 = wuffs_lzw__decoder__decode( &self->private_impl.f_lzw, wuffs_base__utility__null_io_writer(&self->private_impl.f_util), v_r); iop_v_r = u_r.data.ptr + u_r.meta.ri; - v_z = t_5; + v_z = t_4; } wuffs_base__u64__sat_add_indirect( &self->private_impl.f_compressed_ri, @@ -9567,11 +9577,11 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, } if (wuffs_base__status__is_ok(v_z)) { self->private_impl.f_previous_lzw_decode_ended_abruptly = false; - if (v_block_size > 0) { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); + if (v_need_block_size || (v_block_size > 0)) { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); self->private_impl.c_decode_id_part1[0].scratch = ((uint32_t)(v_block_size)); - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); if (self->private_impl.c_decode_id_part1[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { self->private_impl.c_decode_id_part1[0].scratch -= @@ -9581,7 +9591,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, goto suspend; } iop_a_src += self->private_impl.c_decode_id_part1[0].scratch; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); if (a_src.private_impl.buf) { a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; @@ -9628,6 +9638,7 @@ suspend: v_num_palette_entries; self->private_impl.c_decode_id_part1[0].v_i = v_i; self->private_impl.c_decode_id_part1[0].v_block_size = v_block_size; + self->private_impl.c_decode_id_part1[0].v_need_block_size = v_need_block_size; self->private_impl.c_decode_id_part1[0].v_z = v_z; goto exit; diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 65967ab7..56465ac2 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -620,8 +620,16 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade this.previous_lzw_decode_ended_abruptly = true - var block_size base.u64[..255] = args.src.read_u8_as_u64!??() - while:outer block_size > 0 { + var block_size base.u64[..255] + var need_block_size base.bool = true + while:outer true { + if need_block_size { + need_block_size = false + block_size = args.src.read_u8_as_u64!??() + } + if block_size == 0 { + break + } while args.src.available() == 0 { yield base."$short read" } @@ -642,7 +650,12 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade if block_size > 0 { break } - block_size = args.src.read_u8_as_u64!??() + if args.src.available() <= 0 { + need_block_size = true + break + } + block_size = args.src.peek_u8_as_u64() + args.src.skip_fast!(actual:1, worst_case:1) } if (this.width as base.u64) < args.workbuf.length() { @@ -670,7 +683,7 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade this.previous_lzw_decode_ended_abruptly = false // Skip any trailing blocks. - if block_size > 0 { + if need_block_size or (block_size > 0) { args.src.skip!??(n:block_size as base.u32) this.skip_blocks!??(src:args.src) } diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 0d9483cd..7af3220a 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -808,6 +808,60 @@ const char* test_wuffs_gif_decode_input_is_a_png() { return NULL; } +const char* test_wuffs_gif_decode_missing_two_src_bytes() { + CHECK_FOCUS(__func__); + + wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ + .data = global_src_slice, + }); + + const char* z = read_file(&src, "test/data/pjw-thumbnail.gif"); + if (z) { + return z; + } + + // Trim the final two bytes: the 0x00 end-of-block and the 0x3B trailer. + if (src.meta.wi < 2) { + return "src file is too short"; + } + src.meta.wi -= 2; + + wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); + z = wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); + if (z) { + RETURN_FAIL("check_wuffs_version: \"%s\"", z); + } + + wuffs_base__image_config ic = ((wuffs_base__image_config){}); + wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); + + z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader); + if (z) { + RETURN_FAIL("decode_image_config: got \"%s\"", z); + } + + wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){}); + z = wuffs_base__pixel_buffer__set_from_slice(&pb, &ic.pixcfg, + global_pixel_slice); + if (z) { + RETURN_FAIL("set_from_slice: \"%s\"", z); + } + + z = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader, global_work_slice, + NULL); + if (z != wuffs_base__suspension__short_read) { + RETURN_FAIL("decode_frame: got \"%s\"", z); + } + + // Even we though we haven't seen the 0x00 end-of-block, we should still have + // some pixel data. + wuffs_base__rect_ie_u32 r = wuffs_gif__decoder__frame_dirty_rect(&dec); + if (wuffs_base__rect_ie_u32__is_empty(&r)) { + RETURN_FAIL("dirty_rect: got empty, want non-empty"); + } + return NULL; +} + const char* test_wuffs_gif_decode_multiple_loop_counts() { CHECK_FOCUS(__func__); wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ @@ -1465,6 +1519,7 @@ proc tests[] = { test_wuffs_gif_decode_input_is_a_gif_many_medium_reads, // test_wuffs_gif_decode_input_is_a_gif_many_small_reads, // test_wuffs_gif_decode_input_is_a_png, // + test_wuffs_gif_decode_missing_two_src_bytes, // test_wuffs_gif_decode_multiple_loop_counts, // test_wuffs_gif_frame_dirty_rect, // test_wuffs_gif_num_decoded_frame_configs, //