Have std/png decode truncated images

Fixes #71
This commit is contained in:
Nigel Tao committed 2022-01-23 22:59:06 +11:00
1 parent 985a756a48
commit d53f37997f
3 files changed
+50 -15

No files matched your search

+28 -12
View File
@@ -40539,17 +40539,33 @@ wuffs_png__decoder__decode_frame(
if ((v_pass_width > 0) && (v_pass_height > 0)) {
self->private_impl.f_pass_bytes_per_row = wuffs_png__decoder__calculate_bytes_per_row(self, v_pass_width);
self->private_impl.f_pass_workbuf_length = (((uint64_t)(v_pass_height)) * (1 + self->private_impl.f_pass_bytes_per_row));
if (a_src) {
a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
}
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
status = wuffs_png__decoder__decode_pass(self, a_src, a_workbuf);
if (a_src) {
iop_a_src = a_src->data.ptr + a_src->meta.ri;
}
if (status.repr) {
goto suspend;
while (true) {
{
if (a_src) {
a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
}
wuffs_base__status t_1 = wuffs_png__decoder__decode_pass(self, a_src, a_workbuf);
v_status = t_1;
if (a_src) {
iop_a_src = a_src->data.ptr + a_src->meta.ri;
}
}
if (wuffs_base__status__is_ok(&v_status)) {
goto label__1__break;
} else if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
if (self->private_impl.f_workbuf_wi <= ((uint64_t)(a_workbuf.len))) {
wuffs_png__decoder__filter_and_swizzle(self, a_dst, wuffs_base__slice_u8__subslice_j(a_workbuf, self->private_impl.f_workbuf_wi));
}
while (true) {
status = v_status;
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
v_status = wuffs_base__make_status(wuffs_base__suspension__short_read);
}
}
status = v_status;
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7);
}
label__1__break:;
v_status = wuffs_png__decoder__filter_and_swizzle(self, a_dst, a_workbuf);
if ( ! wuffs_base__status__is_ok(&v_status)) {
status = v_status;
@@ -40564,7 +40580,7 @@ wuffs_png__decoder__decode_frame(
self->private_impl.f_workbuf_hist_pos_base += self->private_impl.f_pass_workbuf_length;
}
if ((self->private_impl.f_interlace_pass == 0) || (self->private_impl.f_interlace_pass >= 7)) {
goto label__1__break;
goto label__2__break;
}
#if defined(__GNUC__)
#pragma GCC diagnostic push
@@ -40575,7 +40591,7 @@ wuffs_png__decoder__decode_frame(
#pragma GCC diagnostic pop
#endif
}
label__1__break:;
label__2__break:;
wuffs_base__u32__sat_add_indirect(&self->private_impl.f_num_decoded_frames_value, 1);
if (self->private_impl.f_num_decoded_frames_value < self->private_impl.f_num_animation_frames_value) {
self->private_impl.f_call_sequence = 5;
+20 -1
View File
@@ -1195,7 +1195,26 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader,
if (pass_width > 0) and (pass_height > 0) {
this.pass_bytes_per_row = this.calculate_bytes_per_row(width: pass_width)
this.pass_workbuf_length = (pass_height as base.u64) * (1 + this.pass_bytes_per_row)
this.decode_pass?(src: args.src, workbuf: args.workbuf)
while true {
status =? this.decode_pass?(src: args.src, workbuf: args.workbuf)
if status.is_ok() {
break
} else if (status == base."$short read") and args.src.is_closed() {
// The input was truncated. Produce whatever pixels we can
// and then generate "$short read" forever.
if this.workbuf_wi <= args.workbuf.length() {
// This might return "#internal error: inconsistent
// workbuf length" because of the ".. this.workbuf_wi".
// We just ignore the error.
this.filter_and_swizzle!(dst: args.dst, workbuf: args.workbuf[.. this.workbuf_wi])
}
while true {
yield? status
status = base."$short read"
} endwhile
}
yield? status
} endwhile
status = this.filter_and_swizzle!(dst: args.dst, workbuf: args.workbuf)
if not status.is_ok() {
return status
+2 -2
View File
@@ -62,13 +62,13 @@ dcbb225a test/data/hippopotamus.bmp
ed4b78fc test/data/hippopotamus.interlaced.gif
dcbb225a test/data/hippopotamus.interlaced.png
c3c4bd65 test/data/hippopotamus.interlaced.truncated.gif
29d02ead test/data/hippopotamus.interlaced.truncated.png
7c6a771b test/data/hippopotamus.interlaced.truncated.png
d3bbed27 test/data/hippopotamus.masked-with-muybridge.gif
7e6acf01 test/data/hippopotamus.masked-with-muybridge.png
dcbb225a test/data/hippopotamus.nie
ed4b78fc test/data/hippopotamus.regular.gif
dcbb225a test/data/hippopotamus.regular.png
2427e42e test/data/hippopotamus.regular.truncated.png
888b1c04 test/data/hippopotamus.regular.truncated.png
2dccfe56 test/data/muybridge-frame-000.wbmp
db2733f5 test/data/muybridge.apng
db2733f5 test/data/muybridge.gif