From 7d73f3cfa410003b6fd522cf4683cf84a4dca392 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 22 May 2023 13:54:28 +1000 Subject: [PATCH] pixconv: fix ycck implicit promotion to signed int Updates https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=59182 --- internal/cgen/base/pixconv-submodule-ycck.c | 9 ++++++--- release/c/wuffs-unsupported-snapshot.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/internal/cgen/base/pixconv-submodule-ycck.c b/internal/cgen/base/pixconv-submodule-ycck.c index 44df25a6..188bf6cd 100644 --- a/internal/cgen/base/pixconv-submodule-ycck.c +++ b/internal/cgen/base/pixconv-submodule-ycck.c @@ -694,9 +694,12 @@ wuffs_base__pixel_swizzler__swizzle_ycck( return wuffs_base__make_status( wuffs_base__error__unsupported_pixel_swizzler_option); } else if (!dst || (width > 0xFFFFu) || (height > 0xFFFFu) || // - (4u <= (h0 - 1u)) || (4u <= (v0 - 1u)) || // - (4u <= (h1 - 1u)) || (4u <= (v1 - 1u)) || // - (4u <= (h2 - 1u)) || (4u <= (v2 - 1u)) || // + (4u <= ((unsigned int)h0 - 1u)) || // + (4u <= ((unsigned int)h1 - 1u)) || // + (4u <= ((unsigned int)h2 - 1u)) || // + (4u <= ((unsigned int)v0 - 1u)) || // + (4u <= ((unsigned int)v1 - 1u)) || // + (4u <= ((unsigned int)v2 - 1u)) || // (scratch_buffer_2k.len < 2048u)) { return wuffs_base__make_status(wuffs_base__error__bad_argument); } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 21aab391..288e9483 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -23343,9 +23343,12 @@ wuffs_base__pixel_swizzler__swizzle_ycck( return wuffs_base__make_status( wuffs_base__error__unsupported_pixel_swizzler_option); } else if (!dst || (width > 0xFFFFu) || (height > 0xFFFFu) || // - (4u <= (h0 - 1u)) || (4u <= (v0 - 1u)) || // - (4u <= (h1 - 1u)) || (4u <= (v1 - 1u)) || // - (4u <= (h2 - 1u)) || (4u <= (v2 - 1u)) || // + (4u <= ((unsigned int)h0 - 1u)) || // + (4u <= ((unsigned int)h1 - 1u)) || // + (4u <= ((unsigned int)h2 - 1u)) || // + (4u <= ((unsigned int)v0 - 1u)) || // + (4u <= ((unsigned int)v1 - 1u)) || // + (4u <= ((unsigned int)v2 - 1u)) || // (scratch_buffer_2k.len < 2048u)) { return wuffs_base__make_status(wuffs_base__error__bad_argument); }