mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix X509_PUBKEY_dup() to not leak memory

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14642)
This commit is contained in:
Pauli 2021-03-25 17:53:57 +10:00
parent 808c63c5d0
commit e7aa284e68
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crypto/x509/x_pubkey.c
View File

@ -207,22 +207,20 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_PUBKEY)
*/
X509_PUBKEY *X509_PUBKEY_dup(const X509_PUBKEY *a)
{
X509_PUBKEY *pubkey = NULL;
X509_PUBKEY *pubkey = OPENSSL_zalloc(sizeof(*pubkey));
if (!x509_pubkey_ex_new((ASN1_VALUE **)&pubkey,
ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL))
|| !x509_pubkey_set0_libctx(pubkey, a->libctx, a->propq)
|| (pubkey->algor = X509_ALGOR_dup(a->algor)) == NULL
|| (pubkey->public_key = ASN1_BIT_STRING_new()) == NULL
|| !ASN1_BIT_STRING_set(pubkey->public_key,
a->public_key->data, a->public_key->length)
|| (a->pkey != NULL && !EVP_PKEY_up_ref(a->pkey))) {
if (pubkey == NULL
|| !x509_pubkey_set0_libctx(pubkey, a->libctx, a->propq)
|| (pubkey->algor = X509_ALGOR_dup(a->algor)) == NULL
|| (pubkey->public_key = ASN1_BIT_STRING_new()) == NULL
|| !ASN1_BIT_STRING_set(pubkey->public_key,
a->public_key->data, a->public_key->length)
|| (a->pkey != NULL && !EVP_PKEY_up_ref(a->pkey))) {
x509_pubkey_ex_free((ASN1_VALUE **)&pubkey,
ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL));
ERR_raise(ERR_LIB_X509, ERR_R_MALLOC_FAILURE);
return NULL;
}
pubkey->pkey = a->pkey;
return pubkey;
}