[FFmpeg-devel] [PATCH 4/5] avcodec/bink: Reorder operations in init to avoid memleak on error

[Michael Niedermayer]

On Sun, Jun 16, 2019 at 12:37:32PM +1000, Peter Ross wrote:
> On Sun, Jun 16, 2019 at 12:00:55AM +0200, Michael Niedermayer wrote:
> > Fixes: Direct leak of 536 byte(s) in 1 object(s)
> > Fixes: 15266/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-5629530426834944
> > 
> > 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/bink.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/libavcodec/bink.c b/libavcodec/bink.c
> > index d0f1b39321..8392bbeeb0 100644
> > --- a/libavcodec/bink.c
> > +++ b/libavcodec/bink.c
> > @@ -1333,13 +1333,13 @@ static av_cold int decode_init(AVCodecContext *avctx)
> >      }
> >      c->avctx = avctx;
> >  
> > +    if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0)
> > +        return ret;
> > +
> >      c->last = av_frame_alloc();
> >      if (!c->last)
> >          return AVERROR(ENOMEM);
> >  
> > -    if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0)
> > -        return ret;
> > -
> >      avctx->pix_fmt = c->has_alpha ? AV_PIX_FMT_YUVA420P : AV_PIX_FMT_YUV420P;
> >      avctx->color_range = c->version == 'k' ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
> >  
> > -- 
> > 2.21.0
> 
> lgtm. please apply.

will apply

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Never trust a computer, one day, it may think you are the virus. -- Compn
-------------- 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/20190616/cc8a2bb3/attachment.sig>