diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-06-27 03:21:10 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-06-27 14:35:07 +0100 |
| commit | d2aea038297e0c64ca66e6844cbb37377365885e (patch) | |
| tree | 13e11f5b4a91e0dc5316bb7c6fb7203c313be84b /crypto/asn1/ameth_lib.c | |
| parent | 3b3b69ab25fbaba80a843dedec5ae9733fefca43 (diff) | |
Memory leak and NULL dereference fixes.
PR#3403
Diffstat (limited to 'crypto/asn1/ameth_lib.c')
| -rw-r--r-- | crypto/asn1/ameth_lib.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index f317204d9c..7df3076e3f 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -262,7 +262,12 @@ int EVP_PKEY_asn1_add_alias(int to, int from) if (!ameth) return 0; ameth->pkey_base_id = to; - return EVP_PKEY_asn1_add0(ameth); + if (!EVP_PKEY_asn1_add0(ameth)) + { + EVP_PKEY_asn1_free(ameth); + return 0; + } + return 1; } int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags, |