From 8a2e74d0536c91585fbe789e0ab7b06cab0289c2 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Thu, 8 Jun 2023 08:05:42 +0200 Subject: Cast the argument to unsigned char when calling isspace() Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/21151) --- apps/cmp.c | 4 ++-- apps/lib/apps.c | 4 ++-- apps/req.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'apps') diff --git a/apps/cmp.c b/apps/cmp.c index 72acabcb6f..94ccde1a74 100644 --- a/apps/cmp.c +++ b/apps/cmp.c @@ -2174,7 +2174,7 @@ static const char *prev_item(const char *opt, const char *end) beg = end; while (beg > opt) { --beg; - if (beg[0] == ',' || isspace(beg[0])) { + if (beg[0] == ',' || isspace(_UC(beg[0]))) { ++beg; break; } @@ -2189,7 +2189,7 @@ static const char *prev_item(const char *opt, const char *end) opt_item[len] = '\0'; while (beg > opt) { --beg; - if (beg[0] != ',' && !isspace(beg[0])) { + if (beg[0] != ',' && !isspace(_UC(beg[0]))) { ++beg; break; } diff --git a/apps/lib/apps.c b/apps/lib/apps.c index b8beef0556..c9b509525c 100644 --- a/apps/lib/apps.c +++ b/apps/lib/apps.c @@ -690,13 +690,13 @@ void *app_malloc(size_t sz, const char *what) char *next_item(char *opt) /* in list separated by comma and/or space */ { /* advance to separator (comma or whitespace), if any */ - while (*opt != ',' && !isspace(*opt) && *opt != '\0') + while (*opt != ',' && !isspace(_UC(*opt)) && *opt != '\0') opt++; if (*opt != '\0') { /* terminate current item */ *opt++ = '\0'; /* skip over any whitespace after separator */ - while (isspace(*opt)) + while (isspace(_UC(*opt))) opt++; } return *opt == '\0' ? NULL : opt; /* NULL indicates end of input */ diff --git a/apps/req.c b/apps/req.c index 59ed6ebaa2..711bdff8bf 100644 --- a/apps/req.c +++ b/apps/req.c @@ -198,7 +198,7 @@ static int duplicated(LHASH_OF(OPENSSL_STRING) *addexts, char *kv) /* Check syntax. */ /* Skip leading whitespace, make a copy. */ - while (isspace(*kv)) + while (isspace(_UC(*kv))) kv++; if ((p = strchr(kv, '=')) == NULL) { BIO_printf(bio_err, "Parse error on -addext: missing '='\n"); @@ -210,7 +210,7 @@ static int duplicated(LHASH_OF(OPENSSL_STRING) *addexts, char *kv) /* Skip trailing space before the equal sign. */ for (p = kv + off; p > kv; --p) - if (!isspace(p[-1])) + if (!isspace(_UC(p[-1]))) break; if (p == kv) { BIO_printf(bio_err, "Parse error on -addext: missing key\n"); -- cgit v1.2.3