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 4190E44A19 for ; Thu, 29 Sep 2022 23:09:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D15368BB5E; Fri, 30 Sep 2022 02:09:36 +0300 (EEST) Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D4D168B9EF for ; Fri, 30 Sep 2022 02:09:30 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oe2en-00FoIe-6z for ffmpeg-devel@ffmpeg.org; Fri, 30 Sep 2022 01:09:29 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id e2b6oUHpr8s8Ue2eno48s2; Fri, 30 Sep 2022 01:09:29 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id e2enoJ04bbZLDe2enoYG98; Fri, 30 Sep 2022 01:09:29 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=633625a9 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=ZgIfr3Eg_3Kr9YytetQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 30 Sep 2022 01:09:27 +0200 Message-Id: <20220929230927.28439-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220929230927.28439-1-michael@niedermayer.cc> References: <20220929230927.28439-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfIm1ZQDegAzjS74QFBBxuDuHwRutXmzplDfZ/cO2JfrCeaNat9cSXf41Smf5aLfj0E+US5Yx9TW1r3R1Cfqp3Dj21/coazfSsG1mtow3WWyJkBJIp8BW XqFNiuKqmjkIBUaGlmIQ0yvCvI4GWBs6fthjTKa+9sYmWaA+bS2/L6iEsICPPDPE89jTyzCo1O5XJw== Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/mlpdec: add max channels check 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: out of array access Fixes: 51648/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-4644322217164800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mlpdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 635f92895c5..0b0eb759901 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -547,6 +547,9 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, return AVERROR_PATCHWELCOME; } + if (max_channel + 1 > MAX_CHANNELS || max_channel + 1 < min_channel) + return AVERROR_INVALIDDATA; + s->min_channel = min_channel; s->max_channel = max_channel; s->coded_channels = ((1LL << (max_channel - min_channel + 1)) - 1) << min_channel; -- 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".