]> granicus.if.org Git - openssl/commitdiff
cryptlib.c: make even non-Windows builds "strtoull-agnostic" [from HEAD].
authorAndy Polyakov <appro@openssl.org>
Sat, 21 Jan 2012 12:18:29 +0000 (12:18 +0000)
committerAndy Polyakov <appro@openssl.org>
Sat, 21 Jan 2012 12:18:29 +0000 (12:18 +0000)
crypto/cryptlib.c

index 615bcebec476b2e4ee9a214f4a2ccff6c68ddecf..766ea8cac7375ed02fd6a2144de4a2c8bda0b5ca 100644 (file)
@@ -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;
     }