Commit 00dfbaad authored by Pauli's avatar Pauli
Browse files

Fix ctype arguments. 



Cast arguments to the various ctype functions to unsigned char to match their
documentation.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4203)
parent 0d68367a

apps/opt.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ char *opt_progname(const char *argv0) 
    if (n > sizeof prog - 1)

        n = sizeof prog - 1;

    for (q = prog, i = 0; i < n; i++, p++)

        *q++ = isupper(*p) ? tolower(*p) : *p;

        *q++ = tolower((unsigned char)*p);

    *q = '\0';

    return prog;

}

apps/rehash.c

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static int massage_filename(char *name) 


    if (q != NULL) {

        for (q++; *q != '\0'; q++) {

            if (!isdigit(*q))

            if (!isdigit((unsigned char)*q))

                return 1;

        }

    }

ssl/ssl_ciph.c

+2 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,8 @@ static int ssl_cipher_process_rulestr(const char *rule_str, 
                   ((ch >= 'a') && (ch <= 'z')) ||

                   (ch == '-') || (ch == '.') || (ch == '='))

#else

            while (isalnum(ch) || (ch == '-') || (ch == '.') || (ch == '='))

            while (isalnum((unsigned char)ch) || (ch == '-') || (ch == '.')

                   || (ch == '='))

#endif

            {

                ch = *(++l);

test/ecstresstest.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int atoi64(const char *in, int64_t *result) 
    for ( ; *in != '\0'; in++) {

        char c = *in;



        if (!isdigit(c))

        if (!isdigit((unsigned char)c))

            return 0;

        ret *= 10;

        ret += (c - '0');

test/evp_test.c

+1 −1
Original line number Diff line number Diff line
@@ -1302,7 +1302,7 @@ static int parse_uint64(const char *value, uint64_t *pr) 
            return -1;

        }

        *pr *= 10;

        if (!TEST_true(isdigit(*p))) {

        if (!TEST_true(isdigit((unsigned char)*p))) {

            TEST_error("Invalid character in string %s", value);

            return -1;

        }