diff options
| author | Yu Yang <yuyang14@kuaishou.com> | 2021-12-15 10:47:28 +0800 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-12-16 11:56:00 +0100 |
| commit | a4580bf95985e033eb8857156db3670eeec48131 (patch) | |
| tree | 91c8b151be2b0e3fe12800bc061d2f030f0edd9a /fftools | |
| parent | 3f46ffe956a563a975b65fcb0bcf131fd30956ff (diff) | |
| download | ffmpeg-a4580bf95985e033eb8857156db3670eeec48131.tar.gz | |
fftools/cmdutils: Avoid crash when opts could not be allocated
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>
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/cmdutils.c | 2 | ||||
| -rw-r--r-- | fftools/cmdutils.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 3c8e5a82cd..882584e9c2 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -2187,7 +2187,7 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, if (!opts) { av_log(NULL, AV_LOG_ERROR, "Could not alloc memory for stream options.\n"); - return NULL; + exit_program(1); } for (i = 0; i < s->nb_streams; i++) opts[i] = filter_codec_opts(codec_opts, s->streams[i]->codecpar->codec_id, diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index 82cda208be..50eed9b13a 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -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 * be applied to the corresponding stream codec context. * - * @return pointer to the created array of dictionaries, NULL if it - * cannot be created + * @return pointer to the created array of dictionaries. + * Calls exit() on failure. */ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary *codec_opts); |