From: Pauli <paul.dale@oracle.com>
Date: Tue, 22 Aug 2017 03:05:30 +0000 (+1000)
Subject: Avoid a self-assignment.
X-Git-Tag: OpenSSL_1_1_1-pre1~794
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=932c0df29b7a5a2902c52e2f536b5b83392e2d42;p=oweals%2Fopenssl.git

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)
---

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)