diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index 819ed4a8..4a69da4b 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -7518,7 +7518,8 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, static wuffs_base__status // wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, wuffs_base__pixel_buffer* a_dst, - wuffs_base__io_reader a_src); + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf); static wuffs_base__status // wuffs_gif__decoder__copy_to_image_buffer(wuffs_gif__decoder* self, @@ -7985,11 +7986,6 @@ wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self, switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; - if (((uint64_t)(a_workbuf.len)) < - ((uint64_t)(self->private_impl.f_width))) { - status = wuffs_base__error__bad_workbuf_length; - goto exit; - } if (self->private_impl.f_call_sequence != 2) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); status = wuffs_gif__decoder__decode_frame_config(self, NULL, a_src); @@ -7998,7 +7994,7 @@ wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self, } } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - status = wuffs_gif__decoder__decode_id_part1(self, a_dst, a_src); + status = wuffs_gif__decoder__decode_id_part1(self, a_dst, a_src, a_workbuf); if (status) { goto suspend; } @@ -9173,7 +9169,8 @@ exit: static wuffs_base__status // wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, wuffs_base__pixel_buffer* a_dst, - wuffs_base__io_reader a_src) { + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf) { wuffs_base__status status = NULL; uint8_t v_flags; @@ -9388,6 +9385,15 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, goto label_0_break; } self->private_impl.f_previous_lzw_decode_ended_abruptly = true; + if (((uint64_t)(self->private_impl.f_width)) < + ((uint64_t)(a_workbuf.len))) { + a_workbuf = wuffs_base__slice_u8__subslice_j( + a_workbuf, ((uint64_t)(self->private_impl.f_width))); + } else if (((uint64_t)(self->private_impl.f_width)) > + ((uint64_t)(a_workbuf.len))) { + status = wuffs_base__error__bad_workbuf_length; + goto exit; + } label_1_continue:; while (true) { v_w = ((wuffs_base__io_writer){}); @@ -9466,6 +9472,15 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, } status = v_z; WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6); + if (((uint64_t)(self->private_impl.f_width)) < + ((uint64_t)(a_workbuf.len))) { + a_workbuf = wuffs_base__slice_u8__subslice_j( + a_workbuf, ((uint64_t)(self->private_impl.f_width))); + } else if (((uint64_t)(self->private_impl.f_width)) > + ((uint64_t)(a_workbuf.len))) { + status = wuffs_base__error__bad_workbuf_length; + goto exit; + } } label_1_break:; } diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index e26ce9cb..4d8f0db2 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -255,13 +255,10 @@ pri func decoder.skip_frame!??(src base.io_reader) { // TODO: honor args.opts. pub func decoder.decode_frame!??(dst ptr base.pixel_buffer, src base.io_reader, workbuf slice base.u8, opts nptr base.decode_frame_options) { - if args.workbuf.length() < (this.width as base.u64) { - return base."?bad workbuf length" - } if this.call_sequence != 2 { this.decode_frame_config!??(dst:nullptr, src:args.src) } - this.decode_id_part1!??(dst:args.dst, src:args.src) + this.decode_id_part1!??(dst:args.dst, src:args.src, workbuf:args.workbuf) this.num_decoded_frames_value ~sat+= 1 this.reset_gc!() @@ -536,7 +533,7 @@ pri func decoder.decode_id_part0!??(src base.io_reader) { } } -pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reader) { +pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reader, workbuf slice base.u8) { var flags base.u8 = args.src.read_u8!??() if (flags & 0x40) != 0 { this.interlace = 4 @@ -634,6 +631,12 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade } this.previous_lzw_decode_ended_abruptly = true + if (this.width as base.u64) < args.workbuf.length() { + args.workbuf = args.workbuf[:this.width as base.u64] + } else if (this.width as base.u64) > args.workbuf.length() { + return base."?bad workbuf length" + } + while:inner true { var w base.io_writer io_bind (io:w, data:this.uncompressed[this.uncompressed_wi:]) { @@ -662,7 +665,14 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade if z == base."$short write" { continue:inner } + yield z + + if (this.width as base.u64) < args.workbuf.length() { + args.workbuf = args.workbuf[:this.width as base.u64] + } else if (this.width as base.u64) > args.workbuf.length() { + return base."?bad workbuf length" + } } }