RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-06 15:21:15 +00:00
Code Issues Projects Releases Wiki Activity

ffmpeg: Fix cleanup after failed allocation of output_files

Browse Source 
Fixes: 39a25908b84604acdaa490138282d091_signal_sigsegv_7ffff713351a_331_WAWV.avi with memlimit of 262144

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-14 15:49:41 +02:00
parent 15629129dd
commit 6e80fe1ecd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg.c
View File

@ -500,7 +500,10 @@ static void ffmpeg_cleanup(int ret)
/* close files */ /* close files */
for (i = 0; i < nb_output_files; i++) { for (i = 0; i < nb_output_files; i++) {
OutputFile *of = output_files[i]; OutputFile *of = output_files[i];
AVFormatContext *s = of->ctx; AVFormatContext *s;
if (!of)
continue;
s = of->ctx;
if (s && s->oformat && !(s->oformat->flags & AVFMT_NOFILE)) if (s && s->oformat && !(s->oformat->flags & AVFMT_NOFILE))
avio_closep(&s->pb); avio_closep(&s->pb);
avformat_free_context(s); avformat_free_context(s);