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 A52E744D76 for ; Mon, 21 Nov 2022 18:54:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9441F68B79A; Mon, 21 Nov 2022 20:54:03 +0200 (EET) Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7853568AEB2 for ; Mon, 21 Nov 2022 20:53:57 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id A971220004 for ; Mon, 21 Nov 2022 18:53:55 +0000 (UTC) Date: Mon, 21 Nov 2022 19:53:53 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20221121185353.GE710311@pb2> References: <20221117231418.20994-1-michael@niedermayer.cc> <20221117231418.20994-2-michael@niedermayer.cc> <166903160666.26119.6366120610609027209@lain.khirnov.net> MIME-Version: 1.0 In-Reply-To: <166903160666.26119.6366120610609027209@lain.khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH 2/2] avcodec/h263dec: Avoid parsing extradata repeatedly 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="===============5661714048131260269==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============5661714048131260269== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4Epv4kl9IRBfg3rk" Content-Disposition: inline --4Epv4kl9IRBfg3rk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Nov 21, 2022 at 12:53:26PM +0100, Anton Khirnov wrote: > Quoting Michael Niedermayer (2022-11-18 00:14:18) > > Fixes: Timeout > > Fixes: 52329/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fu= zzer-4716563886637056 > >=20 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz= /tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer > > --- > > libavcodec/h263dec.c | 3 ++- > > libavcodec/mpegvideo.h | 1 + > > 2 files changed, 3 insertions(+), 1 deletion(-) > >=20 > > diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c > > index 71b846ba74..4eab43d939 100644 > > --- a/libavcodec/h263dec.c > > +++ b/libavcodec/h263dec.c > > @@ -492,11 +492,12 @@ retry: > > } else if (CONFIG_MSMPEG4DEC && s->msmpeg4_version) { > > ret =3D ff_msmpeg4_decode_picture_header(s); > > } else if (CONFIG_MPEG4_DECODER && avctx->codec_id =3D=3D AV_CODEC= _ID_MPEG4) { > > - if (s->avctx->extradata_size && s->picture_number =3D=3D 0) { > > + if (s->avctx->extradata_size && s->picture_number =3D=3D 0 && = !s->extradata_parsed) { >=20 > Wouldn't it make sense to get rid of the picture_number condition now? I was thinking about droping it too. I dont know why i didnt, you are corre= ct thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The real ebay dictionary, page 2 "100% positive feedback" - "All either got their money back or didnt compla= in" "Best seller ever, very honest" - "Seller refunded buyer after failed scam" --4Epv4kl9IRBfg3rk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCY3vJMwAKCRBhHseHBAsP q3tlAJ9ffUH1uBaIN2QYPWr3rs4iqJf+WwCeMr4qhy/iRljXeRWyTaAQCxzZG8s= =r+/L -----END PGP SIGNATURE----- --4Epv4kl9IRBfg3rk-- --===============5661714048131260269== 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". --===============5661714048131260269==--