diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-02-28 14:47:25 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-02-28 14:47:25 +0000 |
| commit | 92aa50bc0367d43b74b70f70da1500430daee1fd (patch) | |
| tree | 4c9b139445df71a894e4eeb2b8a85a21168cf0e2 /crypto/asn1 | |
| parent | 2f31308b1737fc7ab0f3421851a07efa0487f078 (diff) | |
Fix memory leak cause by race condition when creating public keys.
Thanks to Ivan Nestlerode <inestlerode@us.ibm.com> for reporting this bug.
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/x_pubkey.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index d42b6a2c54..627ec87f9f 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/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; |