From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 2 Dec 2009 13:56:45 +0000 (+0000)
Subject: PR: 2120
X-Git-Tag: OpenSSL-fips-2_0-rc1~1414
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5656f33cea22cc6be6d1ceac2a3807e9562bc90e;p=oweals%2Fopenssl.git

PR: 2120
Submitted by: steve@openssl.org

Initialize fields correctly if pem_str or info are NULL in  EVP_PKEY_asn1_new().
---

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 18957c669e..cd0e1f8fe5 100644
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -301,6 +301,8 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
 		if (!ameth->info)
 			goto err;
 		}
+	else
+		ameth->info = NULL
 
 	if (pem_str)
 		{
@@ -308,6 +310,8 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
 		if (!ameth->pem_str)
 			goto err;
 		}
+	else
+		ameth->pem_str = NULL
 
 	ameth->pub_decode = 0;
 	ameth->pub_encode = 0;