[FFmpeg-cvslog] fftools/cmdutils: don't try to load arguments from file if not needed
Kacper Michajłow
git at videolan.org
Mon Aug 4 23:57:08 EEST 2025
ffmpeg | branch: release/7.0 | Kacper Michajłow <kasper93 at gmail.com> | Mon Jun 30 20:36:09 2025 +0200| [50538d59b13dae0074c0b5f9c97847730a0812d6] | committer: Michael Niedermayer
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 at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 5f62e2de98eaf1afdea238b53b2b5ac8f0875239)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50538d59b13dae0074c0b5f9c97847730a0812d6
---
fftools/cmdutils.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index 309ec4d32f..01d6b8b926 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -256,9 +256,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);
}
More information about the ffmpeg-cvslog
mailing list