From 0f91f23bb63971e9ff9990e894dac91997b3afd8 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 4 Oct 2023 22:13:50 +1100 Subject: [PATCH] std/jpeg: prefer decode_frame errors over swizzle "g++ script/manual-test-truncated-input.cc && ./a.out test/data/*" is now happy. --- release/c/wuffs-unsupported-snapshot.c | 5 ++++- std/jpeg/decode_jpeg.wuffs | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 888a1d98..cbf3f241 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -42156,7 +42156,10 @@ wuffs_jpeg__decoder__decode_frame( } else { v_swizzle_status = wuffs_jpeg__decoder__swizzle_colorful(self, a_dst, a_workbuf); } - if (wuffs_base__status__is_error(&v_swizzle_status)) { + if (wuffs_base__status__is_error(&v_ddf_status)) { + status = v_ddf_status; + goto exit; + } else if (wuffs_base__status__is_error(&v_swizzle_status)) { status = v_swizzle_status; goto exit; } diff --git a/std/jpeg/decode_jpeg.wuffs b/std/jpeg/decode_jpeg.wuffs index 41d9a504..c5c4ceec 100644 --- a/std/jpeg/decode_jpeg.wuffs +++ b/std/jpeg/decode_jpeg.wuffs @@ -892,7 +892,9 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader, } else { swizzle_status = this.swizzle_colorful!(dst: args.dst, workbuf: args.workbuf) } - if swizzle_status.is_error() { + if ddf_status.is_error() { + return ddf_status + } else if swizzle_status.is_error() { return swizzle_status } }