virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ffprobe: fix memleaks on errors

Browse Source 
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-21 05:35:50 +01:00
parent 840c3c0531
commit 47111d366d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ffprobe.c
View File

@ -2398,6 +2398,7 @@ static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename)
print_error(filename, err); print_error(filename, err);
return err; return err;
} }
*fmt_ctx_ptr = fmt_ctx;
if (scan_all_pmts_set) if (scan_all_pmts_set)
av_dict_set(&format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE); av_dict_set(&format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE);
if ((t = av_dict_get(format_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) { if ((t = av_dict_get(format_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
@ -2409,14 +2410,17 @@ static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename)
opts = setup_find_stream_info_opts(fmt_ctx, codec_opts); opts = setup_find_stream_info_opts(fmt_ctx, codec_opts);
orig_nb_streams = fmt_ctx->nb_streams; orig_nb_streams = fmt_ctx->nb_streams;
if ((err = avformat_find_stream_info(fmt_ctx, opts)) < 0) { err = avformat_find_stream_info(fmt_ctx, opts);
print_error(filename, err);
return err;
}
for (i = 0; i < orig_nb_streams; i++) for (i = 0; i < orig_nb_streams; i++)
av_dict_free(&opts[i]); av_dict_free(&opts[i]);
av_freep(&opts); av_freep(&opts);
if (err < 0) {
print_error(filename, err);
return err;
}
av_dump_format(fmt_ctx, 0, filename, 0); av_dump_format(fmt_ctx, 0, filename, 0);
/* bind a decoder to each input stream */ /* bind a decoder to each input stream */
@ -2466,7 +2470,7 @@ static void close_input_file(AVFormatContext **ctx_ptr)
static int probe_file(WriterContext *wctx, const char *filename) static int probe_file(WriterContext *wctx, const char *filename)
{ {
AVFormatContext *fmt_ctx; AVFormatContext *fmt_ctx = NULL;
int ret, i; int ret, i;
int section_id; int section_id;
@ -2475,7 +2479,7 @@ static int probe_file(WriterContext *wctx, const char *filename)
ret = open_input_file(&fmt_ctx, filename); ret = open_input_file(&fmt_ctx, filename);
if (ret < 0) if (ret < 0)
return ret; goto end;
#define CHECK_END if (ret < 0) goto end #define CHECK_END if (ret < 0) goto end
@ -2533,7 +2537,8 @@ static int probe_file(WriterContext *wctx, const char *filename)
} }
end: end:
close_input_file(&fmt_ctx); if (fmt_ctx)
close_input_file(&fmt_ctx);
av_freep(&nb_streams_frames); av_freep(&nb_streams_frames);
av_freep(&nb_streams_packets); av_freep(&nb_streams_packets);
av_freep(&selected_streams); av_freep(&selected_streams);