virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/isom: don't free extradata before calling ff_get_extradata()

Browse Source 
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 0ca33b1d4e.

Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2018-03-06 23:26:22 -03:00
parent 8b0a9f79c8
commit a43e9cdd44
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/isom.c
View File

@@ -526,7 +526,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_log(fc, AV_LOG_TRACE, "Specific MPEG-4 header len=%d\n", len); av_log(fc, AV_LOG_TRACE, "Specific MPEG-4 header len=%d\n", len);
if (!len || (uint64_t)len > (1<<30)) if (!len || (uint64_t)len > (1<<30))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
av_free(st->codecpar->extradata);
if ((ret = ff_get_extradata(fc, st->codecpar, pb, len)) < 0) if ((ret = ff_get_extradata(fc, st->codecpar, pb, len)) < 0)
return ret; return ret;
if (st->codecpar->codec_id == AV_CODEC_ID_AAC) { if (st->codecpar->codec_id == AV_CODEC_ID_AAC) {