From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 28 Feb 2012 14:47:36 +0000 (+0000)
Subject: Fix memory leak cause by race condition when creating public keys.
X-Git-Tag: OpenSSL_0_9_8u~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f0be325f885201430206559831f5e1c936be5df3;p=oweals%2Fopenssl.git

Fix memory leak cause by race condition when creating public keys.

Thanks to Ivan Nestlerode <inestlerode@us.ibm.com> for reporting this bug.
---

diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c
index 91c2756116..94d9f7ebab 100644
--- a/crypto/asn1/x_pubkey.c
+++ b/crypto/asn1/x_pubkey.c
@@ -367,7 +367,16 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
 		goto err;
 		}
 
-	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);
 err: