From d2aea038297e0c64ca66e6844cbb37377365885e Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Fri, 27 Jun 2014 03:21:10 +0100
Subject: Memory leak and NULL dereference fixes.

PR#3403
---
 crypto/asn1/ameth_lib.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'crypto/asn1/ameth_lib.c')

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,
-- 
cgit v1.2.3