From: Andy Polyakov <appro@openssl.org>
Date: Fri, 20 Jul 2018 11:19:11 +0000 (+0200)
Subject: crypto/cryptlib.c: resolve possible race in OPENSSL_isservice.
X-Git-Tag: OpenSSL_1_1_1-pre9~91
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9e4a1c3f65863b0175ddc534e232e63c4f82ea5c;p=oweals%2Fopenssl.git

crypto/cryptlib.c: resolve possible race in OPENSSL_isservice.

Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/6752)
---

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index ad727edf6a..a7894ddac3 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -205,10 +205,14 @@ int OPENSSL_isservice(void)
 
     if (_OPENSSL_isservice.p == NULL) {
         HANDLE mod = GetModuleHandle(NULL);
+        FARPROC f;
+
         if (mod != NULL)
-            _OPENSSL_isservice.f = GetProcAddress(mod, "_OPENSSL_isservice");
-        if (_OPENSSL_isservice.p == NULL)
+            f = GetProcAddress(mod, "_OPENSSL_isservice");
+        if (f == NULL)
             _OPENSSL_isservice.p = (void *)-1;
+        else
+            _OPENSSL_isservice.f = f;
     }
 
     if (_OPENSSL_isservice.p != (void *)-1)