From: Andy Polyakov <appro@openssl.org>
Date: Sat, 1 Dec 2012 18:24:20 +0000 (+0000)
Subject: cryptlib.c: fix logical error.
X-Git-Tag: master-post-reformat~1558
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f91926a2409e96ffe8eb6f6233aaeb6c6a213112;p=oweals%2Fopenssl.git

cryptlib.c: fix logical error.
---

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 28bc254fab..14453491de 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -152,13 +152,16 @@ void OPENSSL_cpuid_setup(void)
 	if (!sscanf(env+off,"%lli",(long long *)&vec)) vec = strtoul(env+off,NULL,0);
 #endif
 	if (off) vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P)&~vec;
+	else if (env[0]==':') vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P);
 
 	OPENSSL_ia32cap_P[2] = 0;
 	if ((env=strchr(env,':'))) {
-	    off = (env[1]=='~')?2:1;
-	    vec = strtoul(env+off,NULL,0);
-	    if (off>1)	OPENSSL_ia32cap_P[2] &= ~vec;
-	    else	OPENSSL_ia32cap_P[2] = vec;
+	    unsigned int vecx;
+	    env++;
+	    off = (env[0]=='~')?1:0;
+	    vecx = strtoul(env+off,NULL,0);
+	    if (off)	OPENSSL_ia32cap_P[2] &= ~vecx;
+	    else	OPENSSL_ia32cap_P[2] = vecx;
 	}
     }
     else