On Sun, Apr 20, 2025 at 06:31:35PM +0200, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > Fixes: out of array access
> > Fixes: crash-a41ef3db699013f669b076f02f36942925f5a98c
> >
> > Found-by: Kacper Michajlow <kaspe...@gmail.com>
> > Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
> > ---
> > libavcodec/h263dec.c | 13 +++++++++----
> > 1 file changed, 9 insertions(+), 4 deletions(-)
> >
> > diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
> > index 0c23012584e..5eefdc4602b 100644
> > --- a/libavcodec/h263dec.c
> > +++ b/libavcodec/h263dec.c
> > @@ -431,6 +431,7 @@ int ff_h263_decode_frame(AVCodecContext *avctx, AVFrame
> > *pict,
> > MpegEncContext *s = avctx->priv_data;
> > int ret;
> > int slice_ret = 0;
> > + int bak_width, bak_height;
> >
> > /* no supplementary picture */
> > if (buf_size == 0) {
> > @@ -482,6 +483,9 @@ retry:
> > if (ret < 0)
> > return ret;
> >
> > + bak_width = s->width;
> > + bak_height = s->height;
> > +
> > /* let's go :-) */
> > if (CONFIG_WMV2_DECODER && s->msmpeg4_version == MSMP4_WMV2) {
> > ret = ff_wmv2_decode_picture_header(s);
> > @@ -501,11 +505,12 @@ retry:
> > }
> >
> > if (ret < 0 || ret == FRAME_SKIPPED) {
> > - if ( s->width != avctx->coded_width
> > - || s->height != avctx->coded_height) {
> > + if ( s->width != bak_width
> > + || s->height != bak_height) {
> > av_log(s->avctx, AV_LOG_WARNING, "Reverting picture
> > dimensions change due to header decoding failure\n");
> > - s->width = avctx->coded_width;
> > - s->height= avctx->coded_height;
> > + s->width = bak_width;
> > + s->height= bak_height;
> > +
> > }
> > }
> > if (ret == FRAME_SKIPPED)
>
>
> Can I have the testcase?sent privately thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Never trust a computer, one day, it may think you are the virus. -- Compn
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
