From 2c908f22c2af0775a6ffe3466aad174a0ace00dd Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Tue, 29 Nov 2016 00:28:55 +0100 Subject: [PATCH] avidec: fix leaking extradata Reviewed-by: Michael Niedermayer Signed-off-by: Andreas Cadhalpun --- libavformat/avidec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index e5a292ee42..d4659657c3 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -770,6 +770,10 @@ FF_ENABLE_DEPRECATION_WARNINGS st->codecpar->extradata_size = esize - 10 * 4; } else st->codecpar->extradata_size = size - 10 * 4; + if (st->codecpar->extradata) { + av_log(s, AV_LOG_WARNING, "New extradata in strf chunk, freeing previous one.\n"); + av_freep(&st->codecpar->extradata); + } if (ff_get_extradata(s, st->codecpar, pb, st->codecpar->extradata_size) < 0) return AVERROR(ENOMEM); } @@ -925,6 +929,10 @@ FF_ENABLE_DEPRECATION_WARNINGS st = s->streams[stream_index]; if (size<(1<<30)) { + if (st->codecpar->extradata) { + av_log(s, AV_LOG_WARNING, "New extradata in strd chunk, freeing previous one.\n"); + av_freep(&st->codecpar->extradata); + } if (ff_get_extradata(s, st->codecpar, pb, size) < 0) return AVERROR(ENOMEM); }