Commit 805923f2 authored by Luca Barbato's avatar Luca Barbato Committed by Michael Niedermayer

avformat: Free the internal codec context at the end

Avoid a use after free in avformat_find_stream_info.

(cherry picked from commit 9e4a5eb5)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 80b6f5d1
......@@ -3273,12 +3273,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
}
av_opt_set(ic, "skip_clear", "0", AV_OPT_SEARCH_CHILDREN);
// close codecs which were opened in try_decode_frame()
for (i = 0; i < ic->nb_streams; i++) {
st = ic->streams[i];
avcodec_close(st->codec);
}
ff_rfps_calculate(ic);
for (i = 0; i < ic->nb_streams; i++) {
......@@ -3387,6 +3381,7 @@ find_stream_info_err:
ic->streams[i]->codec->thread_count = 0;
if (st->info)
av_freep(&st->info->duration_error);
avcodec_close(st->codec);
av_freep(&ic->streams[i]->info);
}
if (ic->pb)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment