std/webp: relax VP8L color transform validity

This commit, part of a series, is inspired by pull request PR #168 by
Damian Kaczmarek (with AI assistance), with some modifications.

Updates PR #168
This commit is contained in:
Nigel Tao committed 2026-07-16 21:49:31 +10:00
1 parent c2f44c84d1
commit 183beab481
3 files changed
+52 -30

No files matched your search

+17 -10
View File
@@ -16224,7 +16224,6 @@ extern const char wuffs_webp__error__bad_transform[];
extern const char wuffs_webp__error__short_chunk[];
extern const char wuffs_webp__error__truncated_input[];
extern const char wuffs_webp__error__unsupported_number_of_huffman_groups[];
extern const char wuffs_webp__error__unsupported_transform_after_color_indexing_transform[];
extern const char wuffs_webp__error__unsupported_webp_file[];
// ---------------- Public Consts
@@ -86934,7 +86933,6 @@ const char wuffs_webp__error__bad_transform[] = "#webp: bad transform";
const char wuffs_webp__error__short_chunk[] = "#webp: short chunk";
const char wuffs_webp__error__truncated_input[] = "#webp: truncated input";
const char wuffs_webp__error__unsupported_number_of_huffman_groups[] = "#webp: unsupported number of Huffman groups";
const char wuffs_webp__error__unsupported_transform_after_color_indexing_transform[] = "#webp: unsupported transform after color indexing transform";
const char wuffs_webp__error__unsupported_webp_file[] = "#webp: unsupported WebP file";
const char wuffs_webp__error__internal_error_inconsistent_huffman_code[] = "#webp: internal error: inconsistent Huffman code";
const char wuffs_webp__error__internal_error_inconsistent_dst_buffer[] = "#webp: internal error: inconsistent dst buffer";
@@ -89904,6 +89902,7 @@ wuffs_webp__decoder__do_decode_frame(
uint8_t v_c8 = 0;
uint32_t v_has_more = 0;
uint32_t v_width = 0;
uint32_t v_saved_width = 0;
wuffs_base__slice_u8 v_dst = {0};
wuffs_base__slice_u8 v_tile_data = {0};
wuffs_base__status v_status = wuffs_base__make_status(NULL);
@@ -90025,10 +90024,7 @@ wuffs_webp__decoder__do_decode_frame(
goto suspend;
}
while (true) {
if ((((uint64_t)(self->private_impl.f_workbuf_offset_for_color_indexing)) > ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u]))) ||
(((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u])) > ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[1u]))) ||
(((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[1u])) > ((uint64_t)(a_workbuf.len))) ||
(((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u])) > ((uint64_t)(a_workbuf.len)))) {
if ((((uint64_t)(self->private_impl.f_workbuf_offset_for_color_indexing)) > ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u]))) || (((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u])) > ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[1u]))) || (((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[1u])) > ((uint64_t)(a_workbuf.len)))) {
status = wuffs_base__make_status(wuffs_base__error__bad_workbuf_length);
goto exit;
}
@@ -90065,6 +90061,11 @@ wuffs_webp__decoder__do_decode_frame(
goto exit;
}
v_pix = wuffs_base__slice_u8__subslice_j(a_workbuf, ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u])));
v_saved_width = self->private_impl.f_width;
if (self->private_impl.f_seen_transform[3u] && (((uint64_t)(self->private_impl.f_workbuf_offset_for_color_indexing)) <= ((uint64_t)(v_pix.len)))) {
v_pix = wuffs_base__slice_u8__subslice_i(v_pix, ((uint64_t)(self->private_impl.f_workbuf_offset_for_color_indexing)));
self->private_impl.f_width = self->private_impl.f_color_indexing_width;
}
v_which = self->private_impl.f_n_transforms;
while (v_which > 0u) {
v_which -= 1u;
@@ -90084,6 +90085,10 @@ wuffs_webp__decoder__do_decode_frame(
} else if (v_transform_type == 2u) {
wuffs_webp__decoder__apply_transform_subtract_green(self, v_pix);
} else {
self->private_impl.f_width = v_saved_width;
if (((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u])) <= ((uint64_t)(a_workbuf.len))) {
v_pix = wuffs_base__slice_u8__subslice_j(a_workbuf, ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[0u])));
}
wuffs_webp__decoder__apply_transform_color_indexing(self, v_pix);
v_width = self->private_impl.f_width;
}
@@ -90134,6 +90139,7 @@ wuffs_webp__decoder__decode_transform(
uint8_t v_c8 = 0;
uint32_t v_transform_type = 0;
uint32_t v_tile_size_log2 = 0;
uint32_t v_width = 0;
wuffs_base__slice_u8 v_p = {0};
const uint8_t* iop_a_src = NULL;
@@ -90178,9 +90184,6 @@ wuffs_webp__decoder__decode_transform(
if (self->private_impl.f_seen_transform[v_transform_type] || (self->private_impl.f_n_transforms >= 4u)) {
status = wuffs_base__make_status(wuffs_webp__error__bad_transform);
goto exit;
} else if (self->private_impl.f_seen_transform[3u]) {
status = wuffs_base__make_status(wuffs_webp__error__unsupported_transform_after_color_indexing_transform);
goto exit;
}
self->private_impl.f_seen_transform[v_transform_type] = true;
self->private_impl.f_transform_type[self->private_impl.f_n_transforms] = ((uint8_t)(v_transform_type));
@@ -90230,6 +90233,10 @@ wuffs_webp__decoder__decode_transform(
goto suspend;
}
while (true) {
v_width = self->private_impl.f_width;
if (self->private_impl.f_seen_transform[3u]) {
v_width = self->private_impl.f_color_indexing_width;
}
if ((((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 1u)])) > ((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 2u)]))) || (((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 2u)])) > ((uint64_t)(a_workbuf.len)))) {
status = wuffs_base__make_status(wuffs_base__error__bad_workbuf_length);
goto exit;
@@ -90243,7 +90250,7 @@ wuffs_webp__decoder__decode_transform(
((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 1u)])),
((uint64_t)(self->private_impl.f_workbuf_offset_for_transform[(v_transform_type + 2u)]))),
a_src,
((self->private_impl.f_width + ((((uint32_t)(1u)) << v_tile_size_log2) - 1u)) >> v_tile_size_log2),
((v_width + ((((uint32_t)(1u)) << v_tile_size_log2) - 1u)) >> v_tile_size_log2),
((self->private_impl.f_height + ((((uint32_t)(1u)) << v_tile_size_log2) - 1u)) >> v_tile_size_log2),
wuffs_base__utility__empty_slice_u8(),
0u);
+21 -6
View File
@@ -20,7 +20,6 @@ pub status "#bad transform"
pub status "#short chunk"
pub status "#truncated input"
pub status "#unsupported number of Huffman groups"
pub status "#unsupported transform after color indexing transform"
pub status "#unsupported WebP file"
pri status "#internal error: inconsistent Huffman code"
@@ -373,6 +372,7 @@ pri func decoder.do_decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reade
var c8 : base.u8
var has_more : base.u32[..= 1]
var width : base.u32[..= 0x4000]
var saved_width : base.u32[..= 0x4000]
var dst : slice base.u8
var tile_data : roslice base.u8
var status : base.status
@@ -427,10 +427,11 @@ pri func decoder.do_decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reade
while true {
if ((this.workbuf_offset_for_color_indexing as base.u64) > (this.workbuf_offset_for_transform[0] as base.u64)) or
((this.workbuf_offset_for_transform[0] as base.u64) > (this.workbuf_offset_for_transform[1] as base.u64)) or
((this.workbuf_offset_for_transform[1] as base.u64) > args.workbuf.length()) or
((this.workbuf_offset_for_transform[0] as base.u64) > args.workbuf.length()) {
((this.workbuf_offset_for_transform[1] as base.u64) > args.workbuf.length()) {
return base."#bad workbuf length"
}
assert (this.workbuf_offset_for_transform[0] as base.u64) <= args.workbuf.length() via "a <= b: a <= c; c <= b"(c: this.workbuf_offset_for_transform[1] as base.u64)
dst = args.workbuf[
(this.workbuf_offset_for_color_indexing as base.u64) ..
(this.workbuf_offset_for_transform[0] as base.u64)]
@@ -454,6 +455,12 @@ pri func decoder.do_decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reade
return base."#bad workbuf length"
}
pix = args.workbuf[.. (this.workbuf_offset_for_transform[0] as base.u64)]
saved_width = this.width
if this.seen_transform[3] and
((this.workbuf_offset_for_color_indexing as base.u64) <= pix.length()) {
pix = pix[this.workbuf_offset_for_color_indexing as base.u64 ..]
this.width = this.color_indexing_width
}
which = this.n_transforms
while which > 0 {
@@ -476,6 +483,10 @@ pri func decoder.do_decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reade
} else if transform_type == 2 {
this.apply_transform_subtract_green!(pix: pix)
} else {
this.width = saved_width
if (this.workbuf_offset_for_transform[0] as base.u64) <= args.workbuf.length() {
pix = args.workbuf[.. (this.workbuf_offset_for_transform[0] as base.u64)]
}
this.apply_transform_color_indexing!(pix: pix)
width = this.width
}
@@ -497,6 +508,7 @@ pri func decoder.decode_transform?(src: base.io_reader, workbuf: slice base.u8)
var c8 : base.u8
var transform_type : base.u32[..= 3]
var tile_size_log2 : base.u32[..= 9]
var width : base.u32[..= 0x4000]
var p : slice base.u8
if this.n_bits < 2 {
@@ -514,8 +526,6 @@ pri func decoder.decode_transform?(src: base.io_reader, workbuf: slice base.u8)
if this.seen_transform[transform_type] or (this.n_transforms >= 4) {
return "#bad transform"
} else if this.seen_transform[3] {
return "#unsupported transform after color indexing transform"
}
this.seen_transform[transform_type] = true
this.transform_type[this.n_transforms] = transform_type as base.u8
@@ -543,6 +553,11 @@ pri func decoder.decode_transform?(src: base.io_reader, workbuf: slice base.u8)
inv transform_type < 2,
inv tile_size_log2 >= 2,
{
width = this.width
if this.seen_transform[3] {
width = this.color_indexing_width
}
if ((this.workbuf_offset_for_transform[transform_type + 1] as base.u64) > (this.workbuf_offset_for_transform[transform_type + 2] as base.u64)) or
((this.workbuf_offset_for_transform[transform_type + 2] as base.u64) > args.workbuf.length()) {
return base."#bad workbuf length"
@@ -552,7 +567,7 @@ pri func decoder.decode_transform?(src: base.io_reader, workbuf: slice base.u8)
(this.workbuf_offset_for_transform[transform_type + 1] as base.u64) ..
(this.workbuf_offset_for_transform[transform_type + 2] as base.u64)],
src: args.src,
width: (this.width + (((1 as base.u32) << tile_size_log2) - 1)) >> tile_size_log2,
width: (width + (((1 as base.u32) << tile_size_log2) - 1)) >> tile_size_log2,
height: (this.height + (((1 as base.u32) << tile_size_log2) - 1)) >> tile_size_log2,
tile_data: this.util.empty_slice_u8(),
tile_size_log2: 0)
+14 -14
View File
@@ -1,9 +1,9 @@
# Generated by script/print-nia-checksums.sh
OK. ca4c0038 test/3pdata/webpsuite/bad_palette_index.webp
OK. 0ecfd841 test/3pdata/webpsuite/bad_palette_index.webp
OK. 3dd065ab test/3pdata/webpsuite/bryce.webp
OK. 7794c8b2 test/3pdata/webpsuite/bug3.webp
OK. 6fbda804 test/3pdata/webpsuite/color_cache_bits_11.webp
BAD d338aed8 test/3pdata/webpsuite/dual_transform.webp
OK. 0fecb95b test/3pdata/webpsuite/dual_transform.webp
OK. f79224e7 test/3pdata/webpsuite/grid.bmp
OK. 33b7a1f3 test/3pdata/webpsuite/grid.pgm
OK. f79224e7 test/3pdata/webpsuite/grid.png
@@ -20,35 +20,35 @@ OK. 289af407 test/3pdata/webpsuite/lossless_color_transform.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_0.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_1.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_10.webp
BAD df11692d test/3pdata/webpsuite/lossless_vec_1_11.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_11.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_12.webp
BAD df11692d test/3pdata/webpsuite/lossless_vec_1_13.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_13.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_14.webp
BAD df11692d test/3pdata/webpsuite/lossless_vec_1_15.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_15.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_2.webp
BAD df11692d test/3pdata/webpsuite/lossless_vec_1_3.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_3.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_4.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_5.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_6.webp
BAD df11692d test/3pdata/webpsuite/lossless_vec_1_7.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_7.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_8.webp
BAD df11692d test/3pdata/webpsuite/lossless_vec_1_9.webp
OK. f79224e7 test/3pdata/webpsuite/lossless_vec_1_9.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_0.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_1.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_10.webp
BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_11.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_11.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_12.webp
BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_13.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_13.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_14.webp
BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_15.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_15.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_2.webp
BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_3.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_3.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_4.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_5.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_6.webp
BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_7.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_7.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_8.webp
BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_9.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_9.webp
OK. ac62b1e6 test/3pdata/webpsuite/lossy_extreme_probabilities.webp
OK. 84ff1fbf test/3pdata/webpsuite/lossy_q0_f100.webp
OK. 6957defa test/3pdata/webpsuite/near_lossless_75.webp