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 8490C4B915 for ; Wed, 19 Jun 2024 10:57:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6CFB268D691; Wed, 19 Jun 2024 13:57:21 +0300 (EEST) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E7DC68D4B6 for ; Wed, 19 Jun 2024 13:57:15 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 36843E0004 for ; Wed, 19 Jun 2024 10:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718794634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tsq4BAnBt+mxP4ibAFGonF7/utAiDo+dH0sgQiRysiQ=; b=kX/6ktm9QFks7PCOPhX22ot0fS7z2oWsZpCECD+/mPZOHlDY1OH5PXZSxBu11wAHVHA7md 96A7NCNqAu0U8k4oyPrsHtYzYsv40lEAWnfoNnp4TPyhuuaAx4vB9i70IwR8eYO8qbc5zG gmm1mLLs0NpBHy2sy173+hWj7Y/9JDaIevyhSUGTNfzUloN2E/DbHhIF2aJ814wD39jSSw HI3IZGKt/1cf+vUlu8jhbZuNoXvBl5WcuRLTarYqsYFAZOmuYPBF7WvkHtbbl/p2RM7QeP 7mmBS+nkq3cqWHn773zp0LFlGmmxMHJbiLUK5SEWWuzFoGWvlN9Gpi25/FuTQw== Date: Wed, 19 Jun 2024 12:57:13 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240619105713.GO4991@pb2> References: <20240616230831.912377-1-michael@niedermayer.cc> <20240616230831.912377-4-michael@niedermayer.cc> MIME-Version: 1.0 In-Reply-To: X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH 4/9] avformat/iamf_parse: Layer, thou shalt not be 0 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="===============5443909382936093066==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============5443909382936093066== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="E+IgQzR66AIOcbjA" Content-Disposition: inline --E+IgQzR66AIOcbjA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 17, 2024 at 09:33:59PM -0300, James Almer wrote: > On 6/16/2024 8:08 PM, Michael Niedermayer wrote: > > Fixes: out of array access > > Fixes: 68302/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-46657= 93796177920 > >=20 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz= /tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer > > --- > > libavformat/iamf_parse.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > >=20 > > diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c > > index 5c2ff6862a7..12c2b9533a8 100644 > > --- a/libavformat/iamf_parse.c > > +++ b/libavformat/iamf_parse.c > > @@ -330,7 +330,7 @@ static int scalable_channel_layout_config(void *s, = AVIOContext *pb, > > nb_layers =3D avio_r8(pb) >> 5; // get_bits(&gb, 3); > > // skip_bits(&gb, 5); //reserved > > - if (nb_layers > 6) > > + if (nb_layers > 6 || nb_layers =3D=3D 0) > > return AVERROR_INVALIDDATA; > > audio_element->layers =3D av_calloc(nb_layers, sizeof(*audio_elem= ent->layers)); >=20 > LGMT, but please change the commit message. just change ? as in "to anything i feel like" ? :) ok will apply thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Nations do behave wisely once they have exhausted all other alternatives.= =20 -- Abba Eban --E+IgQzR66AIOcbjA Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZnK5iQAKCRBhHseHBAsP q9toAJ9vdNDFZ/9+q5yokpNaCADZA0ZE0gCgi8LP1fsq5QtDCw3zPTRi1t/xRr4= =gcfB -----END PGP SIGNATURE----- --E+IgQzR66AIOcbjA-- --===============5443909382936093066== 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". --===============5443909382936093066==--