aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-08-22 13:05:30 +1000
committerPauli <paul.dale@oracle.com>2017-08-22 13:07:37 +1000
commit932c0df29b7a5a2902c52e2f536b5b83392e2d42 (patch)
tree9b8c02ad1b79ae22cf733f2417457383121ba19f
parent9c481c2fdcbea3015f17fc5d5be8ed4a31811504 (diff)
downloadopenssl-932c0df29b7a5a2902c52e2f536b5b83392e2d42.tar.gz
Avoid a self-assignment.
Clang is generating a warning over an assignment of a variable to itself. This occurs on an ASCII based machine where the convert to ASCII macro doesn't do anything. The fix is to introduce a temporary variable. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4214)
-rw-r--r--crypto/ctype.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/ctype.c b/crypto/ctype.c
index 89ed5bf486..588c6dac3c 100644
--- a/crypto/ctype.c
+++ b/crypto/ctype.c
@@ -251,9 +251,9 @@ int ossl_fromascii(int c)
int ossl_ctype_check(int c, unsigned int mask)
{
const int max = sizeof(ctype_char_map) / sizeof(*ctype_char_map);
+ const int a = ossl_toascii(c);
- c = ossl_toascii(c);
- return c >= 0 && c < max && (ctype_char_map[c] & mask) != 0;
+ return a >= 0 && a < max && (ctype_char_map[a] & mask) != 0;
}
#if defined(CHARSET_EBCDIC) && !defined(CHARSET_EBCDIC_TEST)