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 46D6F47A6A for ; Fri, 29 Sep 2023 19:21:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF7E868CC44; Fri, 29 Sep 2023 22:21:20 +0300 (EEST) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9993068CB61 for ; Fri, 29 Sep 2023 22:21:14 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E4089C0003 for ; Fri, 29 Sep 2023 19:21:13 +0000 (UTC) Date: Fri, 29 Sep 2023 21:21:12 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20230929192112.GH3543730@pb2> References: <20230416222518.21308-1-michael@niedermayer.cc> <20230416222518.21308-3-michael@niedermayer.cc> <168172778665.3843.7055261507093326884@lain.khirnov.net> <20230417231820.GM275832@pb2> MIME-Version: 1.0 In-Reply-To: X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH 3/5] avformat/mov: Better check for duplicate iloc 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="===============6976413256694615848==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============6976413256694615848== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="LWVQOr/QoF/fPPTS" Content-Disposition: inline --LWVQOr/QoF/fPPTS Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Apr 25, 2023 at 03:22:50PM -0700, Vignesh Venkatasubramanian wrote: > On Mon, Apr 17, 2023 at 4:18=E2=80=AFPM Michael Niedermayer > wrote: > > > > On Mon, Apr 17, 2023 at 12:36:26PM +0200, Anton Khirnov wrote: > > > Quoting Michael Niedermayer (2023-04-17 00:25:16) > > > > Fixes: memleak > > > > Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6= 674082962997248 > > > > > > > > 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(-) > > > > > > > > diff --git a/libavformat/mov.c b/libavformat/mov.c > > > > index 057fd872b10..6853bb324cf 100644 > > > > --- a/libavformat/mov.c > > > > +++ b/libavformat/mov.c > > > > @@ -7777,7 +7777,7 @@ static int mov_read_iloc(MOVContext *c, AVIOC= ontext *pb, MOVAtom atom) > > > > return 0; > > > > } > > > > > > > > - if (c->fc->nb_streams) { > > > > + if (c->fc->nb_streams || c->avif_info) { > > > > > > This first condition is now redundant, is it not? > > > > Iam not sure >=20 > I think the second condition alone should be enough here. Either way, > lgtm (if the current patch is more clearer for readers). Ill apply with teh first condition converted to an assert then >=20 > > what exactly happens if a trak occurs before > > >=20 > If a trak occurs before, then the condition in the line above should > take care of that case (!c->is_still_picture_avif). Because if a trak > was found, it will not be considered a still picture. >=20 > > Iam also not sure what happens if multiple meta tags occur triggering > > the avif stream addition, i may be missing something but the code seems > > not to expect that > > >=20 > Multiple meta tags are not allowed in the AVIF/HEIF specification. sure but what happens if the occur anyway, does the code handle that with no undefined behavior ? thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I have often repented speaking, but never of holding my tongue. -- Xenocrates --LWVQOr/QoF/fPPTS Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZRcjpQAKCRBhHseHBAsP q+ltAJ4jSrG8vf6akHB38jgbeDw8fWC7TwCfawdxEod2O9u9xg9fsGyyW8B0xMw= =u9xV -----END PGP SIGNATURE----- --LWVQOr/QoF/fPPTS-- --===============6976413256694615848== 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". --===============6976413256694615848==--