From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 4/4] avcodec/vp3: Check width to avoid assertion failure
Date: Tue, 28 Mar 2023 22:10:55 +0200
Message-ID: <20230328201055.GB375355@pb2> (raw)
In-Reply-To: <CAK+ULv6TTAaEq8da=NUdt0R1s7DD76bxTY1PnCPf3FEy86hfzg@mail.gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 3136 bytes --]
On Mon, Mar 27, 2023 at 01:45:01AM +0100, Kieran Kunhya wrote:
> On Sun, 26 Mar 2023, 23:27 Michael Niedermayer, <michael@niedermayer.cc>
> wrote:
>
> > Fixes: Assertion failure on x86-32
> > Fixes:
> > 39641/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_THEORA_fuzzer-5925660741206016
> >
> > Found-by: continuous fuzzing process
> > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by
> > <https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by>:
> > Michael Niedermayer <michael@niedermayer.cc>
> > ---
> > libavcodec/vp3.c | 8 +++++++-
> > 1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
> > index 9660def675f..22348559461 100644
> > --- a/libavcodec/vp3.c
> > +++ b/libavcodec/vp3.c
> > @@ -2353,6 +2353,8 @@ static av_cold int vp3_decode_init(AVCodecContext
> > *avctx)
> > s->avctx = avctx;
> > s->width = FFALIGN(avctx->coded_width, 16);
> > s->height = FFALIGN(avctx->coded_height, 16);
> > + if (s->width < 18)
> > + return AVERROR_PATCHWELCOME;
> > if (avctx->codec_id != AV_CODEC_ID_THEORA)
> > avctx->pix_fmt = AV_PIX_FMT_YUV420P;
> > avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
> > @@ -2919,7 +2921,9 @@ static int theora_decode_header(AVCodecContext
> > *avctx, GetBitContext *gb)
> > /* sanity check */
> > if (av_image_check_size(visible_width, visible_height, 0, avctx) < 0
> > ||
> > visible_width + offset_x > s->width ||
> > - visible_height + offset_y > s->height) {
> > + visible_height + offset_y > s->height ||
> > + visible_width < 18
> > + ) {
> > av_log(avctx, AV_LOG_ERROR,
> > "Invalid frame dimensions - w:%d h:%d x:%d y:%d
> > (%dx%d).\n",
> > visible_width, visible_height, offset_x, offset_y,
> > @@ -2965,6 +2969,8 @@ static int theora_decode_header(AVCodecContext
> > *avctx, GetBitContext *gb)
> > } else
> > avctx->pix_fmt = AV_PIX_FMT_YUV420P;
> >
> > + if (s->width < 18)
> > + return AVERROR_PATCHWELCOME;
> > ret = ff_set_dimensions(avctx, s->width, s->height);
> > if (ret < 0)
> > return ret;
> > --
> > 2.17.1
> >
>
> Please provide some explanation around the number "18"
Its because the source needed for MC of a block is 9x9 and chroma is 1/2
so a width of 18 is ok but 16 could result in a 8 linesize into which a 9x9
block would not fit.
This is x86-32 specific probably as the linesize is rouded up more on 64bit
If theres some value in such small sizes i could look into adjusting the
linesize up in these cases?
ill add this to the commit message:
Fixes: Assertion failure on x86-32
av_assert2(block_w * sizeof(pixel) <= FFABS(buf_linesize)); in ff_emulated_edge_mc()
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Complexity theory is the science of finding the exact solution to an
approximation. Benchmarking OTOH is finding an approximation of the exact
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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:[~2023-03-28 20:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-26 22:26 [FFmpeg-devel] [PATCH 1/4] avcodec/wavarc: Fix several integer overflows Michael Niedermayer
2023-03-26 22:26 ` [FFmpeg-devel] [PATCH 2/4] avcodec/vc1dec: Use av_fast_realloc() for slices Michael Niedermayer
2023-03-26 22:26 ` [FFmpeg-devel] [PATCH 3/4] avcodec/g729postfilter: Limit shift in long term filter Michael Niedermayer
2023-03-26 22:26 ` [FFmpeg-devel] [PATCH 4/4] avcodec/vp3: Check width to avoid assertion failure Michael Niedermayer
2023-03-27 0:45 ` Kieran Kunhya
2023-03-28 20:10 ` Michael Niedermayer [this message]
2023-03-27 9:59 ` Andreas Rheinhardt
2023-04-02 21:40 ` [FFmpeg-devel] [PATCH 1/4] avcodec/wavarc: Fix several integer overflows 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=20230328201055.GB375355@pb2 \
--to=michael@niedermayer.cc \
--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