RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 01:42:20 +00:00
Code Issues Projects Releases Wiki Activity

avidec: fix leaking extradata

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun 2016-11-29 00:28:55 +01:00
parent 18b9466937
commit 2c908f22c2
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/avidec.c
View File

@ -770,6 +770,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
st->codecpar->extradata_size = esize - 10 * 4; st->codecpar->extradata_size = esize - 10 * 4;
} else } else
st->codecpar->extradata_size = size - 10 * 4; 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) if (ff_get_extradata(s, st->codecpar, pb, st->codecpar->extradata_size) < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -925,6 +929,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
st = s->streams[stream_index]; st = s->streams[stream_index];
if (size<(1<<30)) { 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) if (ff_get_extradata(s, st->codecpar, pb, size) < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }