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 7DD9B43775 for ; Tue, 28 Jun 2022 05:21:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A6BFE68B915; Tue, 28 Jun 2022 08:21:55 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5034668B8AE for ; Tue, 28 Jun 2022 08:21:49 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B4C0B24017E for ; Tue, 28 Jun 2022 07:21:48 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id vuKxj2j8NPzy for ; Tue, 28 Jun 2022 07:21:48 +0200 (CEST) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3822124017C for ; Tue, 28 Jun 2022 07:21:48 +0200 (CEST) Received: by lain.khirnov.net (Postfix, from userid 1000) id 7AD121601B2; Tue, 28 Jun 2022 07:21:48 +0200 (CEST) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20220627084347.30362-1-michael@niedermayer.cc> References: <20220627084347.30362-1-michael@niedermayer.cc> Mail-Followup-To: FFmpeg development discussions and patches Date: Tue, 28 Jun 2022 07:21:48 +0200 Message-ID: <165639370846.12703.18353942820053902051@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] avformat/aaxdec: Check for empty segments 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: Quoting Michael Niedermayer (2022-06-27 10:43:47) > Fixes: Timeout > Fixes: 48154/clusterfuzz-testcase-minimized-ffmpeg_dem_AAX_fuzzer-5149094353436672 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- > libavformat/aaxdec.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/libavformat/aaxdec.c b/libavformat/aaxdec.c > index dd1fbde736..bcbff216db 100644 > --- a/libavformat/aaxdec.c > +++ b/libavformat/aaxdec.c > @@ -252,6 +252,8 @@ static int aax_read_header(AVFormatContext *s) > size = avio_rb32(pb); > a->segments[r].start = start + a->data_offset; > a->segments[r].end = a->segments[r].start + size; > + if (!size) > + return AVERROR_INVALIDDATA; Why check for invalid size only after some things are set based on it and not before? -- Anton Khirnov _______________________________________________ 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".