diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-08-04 11:49:27 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-08-04 11:49:57 +0200 |
| commit | 3816791f4a3ed2f7336e83e9ecf4fe26d4d4171e (patch) | |
| tree | 78f242b44506ca357506057d39662df039595eba | |
| parent | 26e02eae4ba359938230bc449feba1d22a4733bd (diff) | |
| download | curl-bagder/getparam-fix-1728.tar.gz | |
getparameter: avoid returning uninitialized 'usedarg'bagder/getparam-fix-1728
Fixes #1728
| -rw-r--r-- | src/tool_getparam.c | 2 | ||||
| -rw-r--r-- | src/tool_parsecfg.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/tool_getparam.c b/src/tool_getparam.c index cc2d816f1..089d28574 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -443,6 +443,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ bool toggle = TRUE; /* how to switch boolean options, on or off. Controlled by using --OPTION or --no-OPTION */ + *usedarg = FALSE; /* default is that we don't use the arg */ if(('-' != flag[0]) || (('-' == flag[0]) && ('-' == flag[1]))) { @@ -496,7 +497,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ letter = parse[0]; subletter = parse[1]; } - *usedarg = FALSE; /* default is that we don't use the arg */ if(hit < 0) { for(j = 0; j < sizeof(aliases)/sizeof(aliases[0]); j++) { diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c index 8432e5794..93814f454 100644 --- a/src/tool_parsecfg.c +++ b/src/tool_parsecfg.c @@ -49,7 +49,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global) int res; FILE *file; char filebuffer[512]; - bool usedarg; + bool usedarg = FALSE; char *home; int rc = 0; struct OperationConfig *operation = global->first; @@ -220,7 +220,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global) #endif res = getparameter(option, param, &usedarg, global, operation); - if(param && *param && !usedarg) + if(!res && param && *param && !usedarg) /* we passed in a parameter that wasn't used! */ res = PARAM_GOT_EXTRA_PARAMETER; |