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 534FC42F0F for ; Mon, 13 Jun 2022 00:11:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B0B6368B522; Mon, 13 Jun 2022 03:11:28 +0300 (EEST) Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67C1F68A56F for ; Mon, 13 Jun 2022 03:11:22 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o0Xfu-0012d9-13 for ffmpeg-devel@ffmpeg.org; Mon, 13 Jun 2022 02:11:22 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 0XbwoecXL8s8U0XfuoKLvi; Mon, 13 Jun 2022 02:11:22 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 0XewozJAB8eSW0XewoM9qM; Mon, 13 Jun 2022 02:10:22 +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=KKE5sHJo c=1 sm=1 tr=0 ts=62a6806e a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=PBlzMNIDDPxE7l9iKnMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 13 Jun 2022 02:10:20 +0200 Message-Id: <20220613001021.8065-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220613001021.8065-1-michael@niedermayer.cc> References: <20220613001021.8065-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfAlCOeS6TkB11m5d0JZQvX/6RNO56fpWOYHmGy7/v6IowELrQ5syM3gxwzxcW3yV2V4zzc1JhZDF6JVF5015h7q0N89ncTG7Sbw0DKHSabi1MWhZAdZL XH2/m5Wz8Oig5VblZHR7eBDjHP8ki0TDhr+EpdGmEedb/esueenkHjX7x6LM9Ddw7RJ1peBIHt5c5g== Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mov: Check the item count in iloc better 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: 47899/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5706852010164224 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index fa471c45ea..3f7b0e3ed1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7501,12 +7501,12 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) return AVERROR_PATCHWELCOME; } item_count = (version < 2) ? avio_rb16(pb) : avio_rb32(pb); - if (item_count > 1) { + if (item_count != 1) { // For still AVIF images, we only support one item. Second item will // generally be found for AVIF images with alpha channel. We don't // support them as of now. - av_log(c->fc, AV_LOG_ERROR, "iloc: item_count > 1 not supported.\n"); - return AVERROR_PATCHWELCOME; + av_log(c->fc, AV_LOG_ERROR, "iloc: item_count != 1 not supported.\n"); + return item_count ? AVERROR_PATCHWELCOME : AVERROR_INVALIDDATA; } // Populate the necessary fields used by mov_build_index. -- 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".