eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-17 20:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

avformat: Free the internal codec context at the end

Browse Source 
Avoid a use after free in avformat_find_stream_info.

(cherry picked from commit 9e4a5eb51b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Luca Barbato
2017-04-12 01:46:30 +02:00
committed by Michael Niedermayer
parent 0bd6717c0f
commit d6ecc61db8
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/utils.c
View File

@@ -3737,12 +3737,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
} }
} }
// close codecs which were opened in try_decode_frame()
for (i = 0; i < ic->nb_streams; i++) {
st = ic->streams[i];
avcodec_close(st->internal->avctx);
}
ff_rfps_calculate(ic); ff_rfps_calculate(ic);
for (i = 0; i < ic->nb_streams; i++) { for (i = 0; i < ic->nb_streams; i++) {
@@ -3923,6 +3917,7 @@ find_stream_info_err:
st = ic->streams[i]; st = ic->streams[i];
if (st->info) if (st->info)
av_freep(&st->info->duration_error); av_freep(&st->info->duration_error);
avcodec_close(ic->streams[i]->internal->avctx);
av_freep(&ic->streams[i]->info); av_freep(&ic->streams[i]->info);
} }
if (ic->pb) if (ic->pb)