From 12d13b84fa40aa657b83d5458944dbd9b978fb7e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 29 May 2025 10:45:52 +0200 Subject: [PATCH] tool_getparam: remove two nextarg NULL checks Because by checking for NULL when the argument can never be NULL, they mislead the static analyzers into thinking it *can* be NULL and then the analyzers tend to warn about other places in the code *without* the check! Closes #17483 --- src/tool_getparam.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 08b1167f19..39defe9e31 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -509,14 +509,13 @@ static void GetFileAndPassword(const char *nextarg, char **file, char **password) { char *certname, *passphrase; - if(nextarg) { - parse_cert_parameter(nextarg, &certname, &passphrase); - free(*file); - *file = certname; - if(passphrase) { - free(*password); - *password = passphrase; - } + /* nextarg is never NULL here */ + parse_cert_parameter(nextarg, &certname, &passphrase); + free(*file); + *file = certname; + if(passphrase) { + free(*password); + *password = passphrase; } } @@ -1090,7 +1089,8 @@ static ParameterError parse_url(struct GlobalConfig *global, struct OperationConfig *config, const char *nextarg) { - if(nextarg && (nextarg[0] == '@')) { + /* nextarg is never NULL here */ + if(nextarg[0] == '@') { /* read URLs from a file, treat all as -O */ struct dynbuf line; ParameterError err = PARAM_OK; -- 2.47.2