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 18957c669e45abe8831a1f344766549c0f9f3b95..cd0e1f8fe542f2892a539f8add22cc7c2c0916cc 100644 (file)
--- 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;