From: Richard Levitte <levitte@openssl.org>
Date: Fri, 17 Feb 2017 13:31:51 +0000 (+0100)
Subject: Fix symbol shadow
X-Git-Tag: OpenSSL_1_1_1-pre1~2352
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d2b53fcdef9e7b482ff1e2d5f305ae798f3d1be2;p=oweals%2Fopenssl.git

Fix symbol shadow

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2663)
---

diff --git a/crypto/mem.c b/crypto/mem.c
index 16558ac78c..aae92d41b1 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -117,16 +117,16 @@ static void parseit(void)
 static int shouldfail(void)
 {
     int roll = (int)(random() % 100);
-    int shouldfail = roll < md_fail_percent;
+    int shoulditfail = roll < md_fail_percent;
     char buff[80];
 
     if (md_tracefd > 0) {
         BIO_snprintf(buff, sizeof(buff),
                      "%c C%ld %%%d R%d\n",
-                     shouldfail ? '-' : '+', md_count, md_fail_percent, roll);
+                     shoulditfail ? '-' : '+', md_count, md_fail_percent, roll);
         write(md_tracefd, buff, strlen(buff));
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
-        if (shouldfail) {
+        if (shoulditfail) {
             void *addrs[30];
             int num = backtrace(addrs, OSSL_NELEM(addrs));
 
@@ -141,7 +141,7 @@ static int shouldfail(void)
             parseit();
     }
 
-    return shouldfail;
+    return shoulditfail;
 }
 
 void ossl_malloc_setup_failures(void)