From: Emilia Kasper <emilia@openssl.org>
Date: Fri, 22 Aug 2014 13:16:00 +0000 (+0200)
Subject: RT3061: slightly amend patch
X-Git-Tag: master-post-reformat~463
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=bc46db60f170873cc323e78e71e582adfa0ddf7f

RT3061: slightly amend patch

Add an extra NULL dereference check

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
---

diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index aa3f55e218..50273b03f3 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -307,7 +307,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 	unsigned char *dp = NULL;
 	int dplen;
 
-	if (!pkey->pkey.dsa->priv_key)
+	if (!pkey->pkey.dsa || !pkey->pkey.dsa->priv_key)
 		{
 		DSAerr(DSA_F_DSA_PRIV_ENCODE,DSA_R_MISSING_PARAMETERS);
 		goto err;
@@ -717,4 +717,3 @@ const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] =
 		old_dsa_priv_encode
 		}
 	};
-