romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-24 18:47:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_getparam: fix cleanarg() for unicode builds

Browse source 
Use the correct type, and make cleanarg an empty macro if the cleaning
ability is absent.

Fixes #9195
Closes #9196

Reviewed-by: Jay Satiro
Reviewed-by: Marcel Raad
This commit is contained in:
Daniel Stenberg 2022-07-23 13:33:57 +02:00
parent 40b6206085
commit 206550a9c2
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/tool_getparam.c
View file

@ -541,9 +541,9 @@ static ParameterError GetSizeParameter(struct GlobalConfig *global,
return PARAM_OK;
}
static void cleanarg(char *str)
{
#ifdef HAVE_WRITABLE_ARGV
static void cleanarg(argv_item_t str)
{
/* now that GetStr has copied the contents of nextarg, wipe the next
* argument out so that the username:password isn't displayed in the
* system process list */
@ -551,14 +551,14 @@ static void cleanarg(char *str)
size_t len = strlen(str);
memset(str, ' ', len);
}
#else
(void)str;
#endif
}
#else
#define cleanarg(x)
#endif
ParameterError getparameter(const char *flag, /* f or -long-flag */
char *nextarg, /* NULL if unset */
char *clearthis,
argv_item_t clearthis,
bool *usedarg, /* set to TRUE if the arg
has been used */
struct GlobalConfig *global,
@ -576,7 +576,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
ParameterError err;
bool toggle = TRUE; /* how to switch boolean options, on or off. Controlled
by using --OPTION or --no-OPTION */
(void)clearthis; /* for !HAVE_WRITABLE_ARGV builds */
*usedarg = FALSE; /* default is that we don't use the arg */
if(('-' != flag[0]) || ('-' == flag[1])) {
@ -2440,7 +2440,7 @@ ParameterError parse_args(struct GlobalConfig *global, int argc,
stillflags = FALSE;
else {
char *nextarg = NULL;
char *clear = NULL;
argv_item_t clear = NULL;
if(i < (argc - 1)) {
nextarg = curlx_convert_tchar_to_UTF8(argv[i + 1]);
if(!nextarg) {

3
src/tool_getparam.h
View file

@ -54,7 +54,8 @@ typedef enum {
struct GlobalConfig;
struct OperationConfig;
ParameterError getparameter(const char *flag, char *nextarg, char *clearthis,
ParameterError getparameter(const char *flag, char *nextarg,
argv_item_t clearthis,
bool *usedarg,
struct GlobalConfig *global,
struct OperationConfig *operation);