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 EE9FB4A0C4 for ; Wed, 20 Mar 2024 02:59:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE83768D388; Wed, 20 Mar 2024 04:59:30 +0200 (EET) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24CA068D307 for ; Wed, 20 Mar 2024 04:59:25 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 56510E0004 for ; Wed, 20 Mar 2024 02:59:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1710903564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=612VgR5w77vFYUPBBRcLDsZbBPSP11/TdPODtSraAmk=; b=cCAMpfmMEziAZAsUFcd+gWFH/Rcg8N8H5+jPndZwwykHY8yOYCAEGFX4WmgA9X+Pq+vlCm VPL8ECoOQXnmbsch6OpUpiR1i2R4th3y62h2Y00xAkeRpPFljkp+y3y9oNzjHfcvwMmsoN x4QSJO5Gs3AdEu6Unbh0MenpMXDoVIP8CrZ/mtxUqQtzdHFWs9U9qVaQVBW1AnzdMmyrLu 8EQa3Gm+/d9xXkYctivReb1FMZFq1LBpoHwOgIHuWBv0MYSCjLuPRCv2h6eU2uhSGVItU7 R+r4OwP6K0lVVy2g/Swnxjua1ZXqPJVfL0YMeNw9Uqvs4FQJLtc9BHCMXpEZlQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 20 Mar 2024 03:59:20 +0100 Message-Id: <20240320025923.3794-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/jpeg2000htdec: Check M_b / magp before using it in a shift 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 MIME-Version: 1.0 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: Fixes: shift exponent -1 is negative Fixes: 65378/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5457678193197056 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000htdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c index 6b9898d3ff..0b94bb5da2 100644 --- a/libavcodec/jpeg2000htdec.c +++ b/libavcodec/jpeg2000htdec.c @@ -1193,6 +1193,9 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c int32_t M_b = magp; + if (magp >= 31) + return AVERROR_INVALIDDATA; + /* codeblock size as constrained by Rec. ITU-T T.800, Table A.18 */ av_assert0(width <= 1024U && height <= 1024U); av_assert0(width * height <= 4096); -- 2.17.1 _______________________________________________ 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".