resolve conflicts

1 files changed, 10 insertions, 1 deletions

diff --git a/src/lib/libcrypto/asn1/x_pubkey.c b/src/lib/libcrypto/asn1/x_pubkey.c
index d42b6a2c54..627ec87f9f 100644
--- a/src/lib/libcrypto/asn1/x_pubkey.c
+++ b/src/lib/libcrypto/asn1/x_pubkey.c
@@ -171,7 +171,16 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
                 goto error;
                 }
 
-        key->pkey = ret;
+        /* Check to see if another thread set key->pkey first */
+        CRYPTO_w_lock(CRYPTO_LOCK_EVP_PKEY);
+        if (key->pkey)
+                {
+                EVP_PKEY_free(ret);
+                ret = key->pkey;
+                }
+        else
+                key->pkey = ret;
+        CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY);
         CRYPTO_add(&ret->references, 1, CRYPTO_LOCK_EVP_PKEY);
 
         return ret;