AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

argp: Don't pass invalid arguments to isspace, isalnum, isalpha, isdigit.

Browse Source 
* lib/argp-help.c (SKIPWS): Cast character to 'unsigned char' before passing it
to isspace().
(fill_in_uparams): Likewise for isalpha(), isalnum(), isdigit().
(canon_doc_option): Likewise for isspace(), isalnum().

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Bruno Haible 2021-01-07 02:06:18 +01:00 committed by Adhemerval Zanella
parent 1b3fc33f81
commit e9f63b5126
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
argp/argp-help.c
View File

@ -166,7 +166,7 @@ fill_in_uparams (const struct argp_state *state)
{
const char *var = getenv ("ARGP_HELP_FMT");
#define SKIPWS(p) do { while (isspace (*p)) p++; } while (0);
#define SKIPWS(p) do { while (isspace ((unsigned char) *p)) p++; } while (0);
if (var)
/* Parse var. */
@ -174,14 +174,14 @@ fill_in_uparams (const struct argp_state *state)
{
SKIPWS (var);
if (isalpha (*var))
if (isalpha ((unsigned char) *var))
{
size_t var_len;
const struct uparam_name *un;
int unspec = 0, val = 0;
const char *arg = var;
while (isalnum (*arg) || *arg == '-' || *arg == '_')
while (isalnum ((unsigned char) *arg) || *arg == '-' || *arg == '_')
arg++;
var_len = arg - var;
@ -206,10 +206,10 @@ fill_in_uparams (const struct argp_state *state)
else
val = 1;
}
else if (isdigit (*arg))
else if (isdigit ((unsigned char) *arg))
{
val = atoi (arg);
while (isdigit (*arg))
while (isdigit ((unsigned char) *arg))
arg++;
SKIPWS (arg);
}
@ -713,12 +713,12 @@ canon_doc_option (const char **name)
{
int non_opt;
/* Skip initial whitespace. */
while (isspace (**name))
while (isspace ((unsigned char) **name))
(*name)++;
/* Decide whether this looks like an option (leading `-') or not. */
non_opt = (**name != '-');
/* Skip until part of name used for sorting. */
while (**name && !isalnum (**name))
while (**name && !isalnum ((unsigned char) **name))
(*name)++;
return non_opt;
}