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 4DC7E42495 for ; Mon, 21 Nov 2022 11:53:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5375868BD2A; Mon, 21 Nov 2022 13:53:34 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3879368BD23 for ; Mon, 21 Nov 2022 13:53:28 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 58480240499 for ; Mon, 21 Nov 2022 12:53:27 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id RZmDySxbpddA for ; Mon, 21 Nov 2022 12:53:26 +0100 (CET) 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 BBBCC2400F5 for ; Mon, 21 Nov 2022 12:53:26 +0100 (CET) Received: by lain.khirnov.net (Postfix, from userid 1000) id A8AAD1601B2; Mon, 21 Nov 2022 12:53:26 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20221117231418.20994-2-michael@niedermayer.cc> References: <20221117231418.20994-1-michael@niedermayer.cc> <20221117231418.20994-2-michael@niedermayer.cc> Mail-Followup-To: FFmpeg development discussions and patches Date: Mon, 21 Nov 2022 12:53:26 +0100 Message-ID: <166903160666.26119.6366120610609027209@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 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: 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-11-18 00:14:18) > Fixes: Timeout > Fixes: 52329/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-4716563886637056 > > 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(-) > > 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 = ff_msmpeg4_decode_picture_header(s); > } else if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) { > - if (s->avctx->extradata_size && s->picture_number == 0) { > + if (s->avctx->extradata_size && s->picture_number == 0 && !s->extradata_parsed) { Wouldn't it make sense to get rid of the picture_number condition now? -- 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".