[FFmpeg-devel] [PATCH] avcodec/agm: Check frame dimensions

[Michael Niedermayer]

On Thu, Apr 11, 2019 at 10:21:49AM +0200, Paul B Mahol wrote:
> On 4/11/19, Michael Niedermayer <michael at niedermayer.cc> wrote:
> > Fixes: out of array access
> > Fixes:
> > 14110/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5649184864075776
> >
> > Found-by: continuous fuzzing process
> > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavcodec/agm.c | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/libavcodec/agm.c b/libavcodec/agm.c
> > index cbd45e8095..b538854613 100644
> > --- a/libavcodec/agm.c
> > +++ b/libavcodec/agm.c
> > @@ -578,6 +578,9 @@ static int decode_frame(AVCodecContext *avctx, void
> > *data,
> >              av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
> >              return AVERROR_INVALIDDATA;
> >          }
> > +        if (s->prev_frame-> width != frame->width ||
> > +            s->prev_frame->height != frame->height)
> > +            return AVERROR_INVALIDDATA;
> >
> >          if (!(s->flags & 2)) {
> >              ret = av_frame_copy(frame, s->prev_frame);
> 
> LGTM

will apply

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Concerning the gods, I have no means of knowing whether they exist or not
or of what sort they may be, because of the obscurity of the subject, and
the brevity of human life -- Protagoras
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20190411/ca652e25/attachment.sig>