ffmpeg | branch: release/2.6 | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Wed May 13 00:22:03 2015 +0200| [73cf5d9a2853f1bc1f4a0d884c880cda51aa7b28] | committer: Andreas Cadhalpun
cafdec: free extradata before allocating it This fixes a memleak if read_kuki_chunk is executed more than once. Reviewed-by: Carl Eugen Hoyos <ceho...@ag.or.at> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> (cherry picked from commit cb7c4f73e5e3debe2646279eaa7cfb493573118b) Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73cf5d9a2853f1bc1f4a0d884c880cda51aa7b28 --- libavformat/cafdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index abbb353..cc6ed0c 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -134,6 +134,7 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) return AVERROR_INVALIDDATA; } + av_freep(&st->codec->extradata); if (ff_alloc_extradata(st->codec, ALAC_HEADER)) return AVERROR(ENOMEM); @@ -166,6 +167,7 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) avio_skip(pb, size - ALAC_NEW_KUKI); } } else { + av_freep(&st->codec->extradata); if (ff_get_extradata(st->codec, pb, size) < 0) return AVERROR(ENOMEM); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog