[FFmpeg-devel] [PATCH] avformat/aacdec: Fix leak in adts_aac_read_packet()

Michael Niedermayer michael at niedermayer.cc
Sun Nov 26 02:01:13 EET 2017


On Sat, Nov 25, 2017 at 03:42:16PM -0300, James Almer wrote:
> On 11/25/2017 3:30 PM, Michael Niedermayer wrote:
> > Fixes: chromium-773637/clusterfuzz-testcase-minimized-6418078673141760
> > 
> > Found-by: ossfuzz/chromium
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavformat/aacdec.c | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> > 
> > diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
> > index 364b33404f..101e8dbea5 100644
> > --- a/libavformat/aacdec.c
> > +++ b/libavformat/aacdec.c
> > @@ -139,7 +139,13 @@ static int adts_aac_read_packet(AVFormatContext *s, AVPacket *pkt)
> >          return AVERROR_INVALIDDATA;
> >      }
> >  
> > -    return av_append_packet(s->pb, pkt, fsize - ADTS_HEADER_SIZE);
> > +    ret = av_append_packet(s->pb, pkt, fsize - ADTS_HEADER_SIZE);
> > +    if (ret < 0) {
> > +        av_packet_unref(pkt);
> > +        return AVERROR_INVALIDDATA;
> 
> Why not just let the line below return ret?

will change


> 
> > +    }
> > +
> > +    return ret;
> >  }
> >  
> >  AVInputFormat ff_aac_demuxer = {
> > 
> 
> LGTM either way.

will apply

thanks

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

Does the universe only have a finite lifespan? No, its going to go on
forever, its just that you wont like living in it. -- Hiranya Peiri
-------------- 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/20171126/6359c0bf/attachment.sig>


More information about the ffmpeg-devel mailing list