diff options
| author | Kacper Michajłow <kasper93@gmail.com> | 2025-06-30 20:36:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2025-07-05 21:05:56 +0200 |
| commit | 5f62e2de98eaf1afdea238b53b2b5ac8f0875239 (patch) | |
| tree | a447a28e270b9ad112b62d1d5e09d14f50fd8517 /fftools/cmdutils.c | |
| parent | 30043cc167516ab01e460f0146038675fd0f5711 (diff) | |
| download | ffmpeg-5f62e2de98eaf1afdea238b53b2b5ac8f0875239.tar.gz | |
fftools/cmdutils: don't try to load arguments from file if not needed
CLI option parser checks if argument exists when needed, but in this
case only OPT_TYPE_BOOL where checked, so OPT_TYPE_FUNC without argument
where trying to load a file from `arg` which is NULL in this case.
Fixes crash on `ffmpeg -/version`
Fixes: 6d17991b7e1bf1a5d104c8a6261709f7e6640d97
Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'fftools/cmdutils.c')
| -rw-r--r-- | fftools/cmdutils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index be21ed2c6c..e442935cae 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -255,9 +255,10 @@ static int write_option(void *optctx, const OptionDef *po, const char *opt, if (*opt == '/') { opt++; - if (po->type == OPT_TYPE_BOOL) { + if (!opt_has_arg(po)) { av_log(NULL, AV_LOG_FATAL, - "Requested to load an argument from file for a bool option '%s'\n", + "Requested to load an argument from file for an option '%s'" + " which does not take an argument\n", po->name); return AVERROR(EINVAL); } |