From a43e9cdd442b3ccf50faa32a15b03bdaff278017 Mon Sep 17 00:00:00 2001 From: James Almer Date: Tue, 6 Mar 2018 23:26:22 -0300 Subject: [PATCH] avformat/isom: don't free extradata before calling ff_get_extradata() ff_get_extradata() frees any existing extradata before allocating now, and using av_free() here leaves a dangling pointer that will result in a double free. Fixes a regression since 0ca33b1d4eb2a2a2e78ff3a37f1647917635b0d2. Tested-by: Michael Niedermayer Signed-off-by: James Almer --- libavformat/isom.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/isom.c b/libavformat/isom.c index 59502a8b3f..2792371c25 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -526,7 +526,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_log(fc, AV_LOG_TRACE, "Specific MPEG-4 header len=%d\n", len); if (!len || (uint64_t)len > (1<<30)) return AVERROR_INVALIDDATA; - av_free(st->codecpar->extradata); if ((ret = ff_get_extradata(fc, st->codecpar, pb, len)) < 0) return ret; if (st->codecpar->codec_id == AV_CODEC_ID_AAC) {