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 CEC6D47A70 for ; Fri, 29 Sep 2023 19:35:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6938068CBAE; Fri, 29 Sep 2023 22:35:55 +0300 (EEST) Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EABEA68CAF6 for ; Fri, 29 Sep 2023 22:35:48 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 46A7060004 for ; Fri, 29 Sep 2023 19:35:47 +0000 (UTC) Date: Fri, 29 Sep 2023 21:35:47 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20230929193547.GI3543730@pb2> References: <20230921180912.10733-1-michael@niedermayer.cc> <20230921180912.10733-6-michael@niedermayer.cc> <169589747786.6638.16749231162126648025@lain.khirnov.net> MIME-Version: 1.0 In-Reply-To: <169589747786.6638.16749231162126648025@lain.khirnov.net> X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH 6/6] avformat/mov: Check avif_info 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: multipart/mixed; boundary="===============0706404553682415499==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============0706404553682415499== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="D+WCZLadiceW8Bs8" Content-Disposition: inline --D+WCZLadiceW8Bs8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 28, 2023 at 12:37:57PM +0200, Anton Khirnov wrote: > Quoting Michael Niedermayer (2023-09-21 20:09:12) > > Fixes: leak > > Fixes: 62164/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-66740= 82962997248 > >=20 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz= /tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer > > --- > > libavformat/mov.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > >=20 > > diff --git a/libavformat/mov.c b/libavformat/mov.c > > index 93c1f9e929a..52939a373ec 100644 > > --- a/libavformat/mov.c > > +++ b/libavformat/mov.c > > @@ -7767,7 +7767,7 @@ static int mov_read_iloc(MOVContext *c, AVIOConte= xt *pb, MOVAtom atom) > > return 0; > > } > > =20 > > - if (c->fc->nb_streams) { > > + if (c->fc->nb_streams || c->avif_info) { >=20 > I remember seeing this patch before and asking whether the first > condition is not redundant now. right, the author of the underlaying code also suggested its redundant, so as suggested there ill apply it with just the 2nd check thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB No human being will ever know the Truth, for even if they happen to say it by chance, they would not even known they had done so. -- Xenophanes --D+WCZLadiceW8Bs8 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZRcnDwAKCRBhHseHBAsP q5tNAJ48AkKWokXReG4etnvHXInPDoVyRQCcC/18Z5WdvH3nFmUToIPrgXoEL1o= =tCqF -----END PGP SIGNATURE----- --D+WCZLadiceW8Bs8-- --===============0706404553682415499== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============0706404553682415499==--