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: Free the internal codec context at the end

Browse Source 
Avoid a use after free in avformat_find_stream_info.

CC: libav-stable@libav.org
This commit is contained in:
Luca Barbato
2017-04-12 01:46:30 +02:00
parent 19c5fa9eea
commit 9e4a5eb51b
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/utils.c
View File

@@ -2466,11 +2466,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
count++; count++;
} }
// 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);
}
for (i = 0; i < ic->nb_streams; i++) { for (i = 0; i < ic->nb_streams; i++) {
st = ic->streams[i]; st = ic->streams[i];
avctx = st->internal->avctx; avctx = st->internal->avctx;
@@ -2570,6 +2565,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
find_stream_info_err: find_stream_info_err:
for (i = 0; i < ic->nb_streams; i++) { for (i = 0; i < ic->nb_streams; i++) {
avcodec_close(ic->streams[i]->internal->avctx);
av_freep(&ic->streams[i]->info); av_freep(&ic->streams[i]->info);
av_bsf_free(&ic->streams[i]->internal->extract_extradata.bsf); av_bsf_free(&ic->streams[i]->internal->extract_extradata.bsf);
av_packet_free(&ic->streams[i]->internal->extract_extradata.pkt); av_packet_free(&ic->streams[i]->internal->extract_extradata.pkt);