Browse Source

avformat: Free the internal codec context at the end

Avoid a use after free in avformat_find_stream_info.

(cherry picked from commit 9e4a5eb51b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.4.14
Luca Barbato Michael Niedermayer 9 years ago
parent
commit
805923f230
1 changed files with 1 additions and 6 deletions
  1. +1
    -6
      libavformat/utils.c

+ 1
- 6
libavformat/utils.c View File

@@ -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)


Loading…
Cancel
Save