[FFmpeg-devel] [PATCH 2/2] avcodec/pngdec: Clean up on av_frame_ref() failure

Michael Niedermayer michael at niedermayer.cc
Tue Sep 19 12:58:52 EEST 2017


On Tue, Sep 19, 2017 at 01:00:52AM -0300, James Almer wrote:
> On 9/16/2017 9:42 PM, Michael Niedermayer wrote:
> > Fixes: memleak
> > Fixes: 3203/clusterfuzz-testcase-minimized-4514553595428864
> > 
> > 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/pngdec.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
> > index dce8faf168..0d6612ccca 100644
> > --- a/libavcodec/pngdec.c
> > +++ b/libavcodec/pngdec.c
> > @@ -1414,7 +1414,7 @@ static int decode_frame_png(AVCodecContext *avctx,
> >      }
> >  
> >      if ((ret = av_frame_ref(data, s->picture.f)) < 0)
> > -        return ret;
> > +        goto the_end;
> >  
> >      *got_frame = 1;
> >  
> 
> LGTM.

will apply

thanks

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

Asymptotically faster algorithms should always be preferred if you have
asymptotical amounts of data
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20170919/62fb9b5f/attachment.sig>


More information about the ffmpeg-devel mailing list