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

fftools/cmdutils: Avoid crash when opts could not be allocated

Browse Source 
If 'opts' could not be allocated, exiting the program to avoid crash when release it.

Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Yu Yang <yuyang14@kuaishou.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Yu Yang 2021-12-15 10:47:28 +08:00 committed by Andreas Rheinhardt
parent 3f46ffe956
commit a4580bf959
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/cmdutils.c
View File

@ -2187,7 +2187,7 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,
if (!opts) { if (!opts) {
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
"Could not alloc memory for stream options.\n"); "Could not alloc memory for stream options.\n");
return NULL; exit_program(1);
} }
for (i = 0; i < s->nb_streams; i++) for (i = 0; i < s->nb_streams; i++)
opts[i] = filter_codec_opts(codec_opts, s->streams[i]->codecpar->codec_id, opts[i] = filter_codec_opts(codec_opts, s->streams[i]->codecpar->codec_id,

4
fftools/cmdutils.h
View File

@ -430,8 +430,8 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, enum AVCodecID codec_id,
* Each dictionary will contain the options from codec_opts which can * Each dictionary will contain the options from codec_opts which can
* be applied to the corresponding stream codec context. * be applied to the corresponding stream codec context.
* *
* @return pointer to the created array of dictionaries, NULL if it * @return pointer to the created array of dictionaries.
* cannot be created * Calls exit() on failure.
*/ */
AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,
AVDictionary *codec_opts); AVDictionary *codec_opts);