From: Anton Khirnov <anton@khirnov.net>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 2/2] avcodec/h263dec: Avoid parsing extradata repeatedly
Date: Mon, 21 Nov 2022 12:53:26 +0100
Message-ID: <166903160666.26119.6366120610609027209@lain.khirnov.net> (raw)
In-Reply-To: <20221117231418.20994-2-michael@niedermayer.cc>
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 <michael@niedermayer.cc>
> ---
> 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".
next prev parent reply other threads:[~2022-11-21 11:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-17 23:14 [FFmpeg-devel] [PATCH 1/2] avcodec/tiff: Avoid 0.0/0.0 in camera_xyz_coeff() Michael Niedermayer
2022-11-17 23:14 ` [FFmpeg-devel] [PATCH 2/2] avcodec/h263dec: Avoid parsing extradata repeatedly Michael Niedermayer
2022-11-21 11:53 ` Anton Khirnov [this message]
2022-11-21 18:53 ` Michael Niedermayer
2022-11-28 19:50 ` Michael Niedermayer
2022-11-28 19:51 ` [FFmpeg-devel] [PATCH 1/2] avcodec/tiff: Avoid 0.0/0.0 in camera_xyz_coeff() Michael Niedermayer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=166903160666.26119.6366120610609027209@lain.khirnov.net \
--to=anton@khirnov.net \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git