har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffprobe: fix crash if the file can't be opened.

Browse Source
This commit is contained in:
Clément Bœsch 2012-02-18 21:34:44 +01:00
parent f23a740303
commit 8688e6acba
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ffprobe.c
View File

@ -1627,9 +1627,9 @@ static int probe_file(WriterContext *wctx, const char *filename)
do_read_packets = do_show_packets || do_count_packets; do_read_packets = do_show_packets || do_count_packets;
ret = open_input_file(&fmt_ctx, filename); ret = open_input_file(&fmt_ctx, filename);
nb_streams_frames = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_frames));
nb_streams_packets = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_packets));
if (ret >= 0) { if (ret >= 0) {
nb_streams_frames = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_frames));
nb_streams_packets = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_packets));
if (do_read_frames || do_read_packets) { if (do_read_frames || do_read_packets) {
const char *chapter; const char *chapter;
if (do_show_frames && do_show_packets && if (do_show_frames && do_show_packets &&
@ -1651,11 +1651,9 @@ static int probe_file(WriterContext *wctx, const char *filename)
if (fmt_ctx->streams[i]->codec->codec_id != CODEC_ID_NONE) if (fmt_ctx->streams[i]->codec->codec_id != CODEC_ID_NONE)
avcodec_close(fmt_ctx->streams[i]->codec); avcodec_close(fmt_ctx->streams[i]->codec);
avformat_close_input(&fmt_ctx); avformat_close_input(&fmt_ctx);
av_freep(&nb_streams_frames);
av_freep(&nb_streams_packets);
} }
av_freep(&nb_streams_frames);
av_freep(&nb_streams_packets);
return ret; return ret;
} }