From: Andy Polyakov <appro@openssl.org>
Date: Sat, 21 Jan 2012 12:18:29 +0000 (+0000)
Subject: cryptlib.c: make even non-Windows builds "strtoull-agnostic" [from HEAD].
X-Git-Tag: OpenSSL_1_0_1-beta3~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f02f7c2c4aa19c8e70b1739fcdab749145d32805;p=openssl

cryptlib.c: make even non-Windows builds "strtoull-agnostic" [from HEAD].
---

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 615bcebec4..766ea8cac7 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -698,7 +698,7 @@ void OPENSSL_cpuid_setup(void)
 #if defined(_WIN32)
 	if (!sscanf(env+off,"%I64i",&vec)) vec = strtoul(env+off,NULL,0);
 #else
-	vec = strtoull(env+off,NULL,0);
+	if (!sscanf(env+off,"%lli",(long long *)&vec)) vec = strtoul(env+off,NULL,0);
 #endif
 	if (off) vec = OPENSSL_ia32_cpuid()&~vec;
     }