From 4ebf0b0ac8888673171162ad50afbfafbada4c8f Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Wed, 19 Nov 2025 23:08:08 +0100 Subject: [PATCH] Properly validate picture dimensions for overflow Change-Id: I42735f6c651d0bb768b9c727209a7b5fe991b456 --- src/enc/picture_enc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/enc/picture_enc.c b/src/enc/picture_enc.c index 6ed93c01..a653217c 100644 --- a/src/enc/picture_enc.c +++ b/src/enc/picture_enc.c @@ -50,11 +50,8 @@ int WebPPictureInitInternal(WebPPicture* picture, int version) { int WebPValidatePicture(const WebPPicture* const picture) { if (picture == NULL) return 0; - if (picture->width <= 0 || picture->height <= 0) { - return WebPEncodingSetError(picture, VP8_ENC_ERROR_BAD_DIMENSION); - } - if (picture->width <= 0 || picture->width / 4 > INT_MAX / 4 || - picture->height <= 0 || picture->height / 4 > INT_MAX / 4) { + if (picture->width <= 0 || picture->width > INT_MAX / 4 || + picture->height <= 0 || picture->height > INT_MAX / 4) { return WebPEncodingSetError(picture, VP8_ENC_ERROR_BAD_DIMENSION); } if (picture->colorspace != WEBP_YUV420 &&