From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3694C4B399 for ; Fri, 5 Jul 2024 00:23:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7086568DB20; Fri, 5 Jul 2024 03:22:33 +0300 (EEST) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7601168D9AB for ; Fri, 5 Jul 2024 03:22:09 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B1B54240006 for ; Fri, 5 Jul 2024 00:22:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720138928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mDAmKIfhw2Gl94NS4spahAMdXzu72d+moyVRqnN0Mq0=; b=YpNxfs6L4lpn7wNeQc142t/zkoTrKmIcevJIal9UL2qdrNTUU4ewAMxdzfS9bYfUFfovSn d9JSDbCl66XrwcoIqr3UFMtPWVfZxR09f6VAZu/npfQLgc2RqgGIQoXrxB6aOkNtbtk0C0 19xAnOeb6UmCh/61jZ+fEIbTzasmMaPDH9Uqc+c46VeqGsyhIYbX8WNnyO9XA8XTsRB0u7 L4xa6RK53n5JwYrC1iWpq5lUt5C9UnXNtGihNXi6Iksbu1Kyh9g37FIPbQlcvT/+EyjSB3 XagD9xruKGHBzpTJB+aQDyuQp339jk43NbVGnuPQkXm+oReH4WFlfLvFgJ3w5Q== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 5 Jul 2024 02:21:56 +0200 Message-ID: <20240705002156.1964272-15-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240705002156.1964272-1-michael@niedermayer.cc> References: <20240705002156.1964272-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 15/15] avcodec/pixlet: Simplify pfx computation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Found by reviewing code related to CID1604365 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/pixlet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c index 6b6e39f2757..e9c561d70d9 100644 --- a/libavcodec/pixlet.c +++ b/libavcodec/pixlet.c @@ -231,8 +231,8 @@ static int read_high_coeffs(AVCodecContext *avctx, const uint8_t *src, int16_t * if (cnt1 >= length) { cnt1 = get_bits(bc, nbits); } else { - pfx = 14 + ((((uint64_t)(value - 14)) >> 32) & (value - 14)); - if (pfx < 1 || pfx > 25) + pfx = FFMIN(value, 14); + if (pfx < 1) return AVERROR_INVALIDDATA; cnt1 *= (1 << pfx) - 1; shbits = show_bits(bc, pfx); -- 2.45.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".