From: Geoff Thorpe <geoff@openssl.org>
Date: Mon, 10 Nov 2003 18:05:22 +0000 (+0000)
Subject: Avoid possible memory leaks in error-handling.
X-Git-Tag: BEN_FIPS_TEST_4^2~11^2~26
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=f7a397cc8d0cf336907a7e05f7a9a94c3cd12877

Avoid possible memory leaks in error-handling.

Submitted by: Nils Larsch
Reviewed by: Geoff Thorpe
---

diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c
index 4c2bd4e5c8..d0fd732098 100644
--- a/crypto/asn1/d2i_pu.c
+++ b/crypto/asn1/d2i_pu.c
@@ -103,8 +103,8 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, unsigned char **pp,
 #endif
 #ifndef OPENSSL_NO_DSA
 	case EVP_PKEY_DSA:
-		if ((ret->pkey.dsa=d2i_DSAPublicKey(&(ret->pkey.dsa),
-			(const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
+		if (!d2i_DSAPublicKey(&(ret->pkey.dsa),
+			(const unsigned char **)pp,length)) /* TMP UGLY CAST */
 			{
 			ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);
 			goto err;
@@ -113,8 +113,8 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, unsigned char **pp,
 #endif
 #ifndef OPENSSL_NO_EC
 	case EVP_PKEY_EC:
-		if ((ret->pkey.eckey = o2i_ECPublicKey(&(ret->pkey.eckey),
-			(const unsigned char **)pp, length)) == NULL)
+		if (!o2i_ECPublicKey(&(ret->pkey.eckey),
+				     (const unsigned char **)pp, length))
 			{
 			ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
 			goto err;
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c
index c32a6eaa49..01698dd217 100644
--- a/crypto/asn1/x_pubkey.c
+++ b/crypto/asn1/x_pubkey.c
@@ -323,7 +323,7 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
 
 	p=key->public_key->data;
         j=key->public_key->length;
-        if ((ret = d2i_PublicKey(type, &ret, &p, (long)j)) == NULL)
+        if (!d2i_PublicKey(type, &ret, &p, (long)j))
 		{
 		X509err(X509_F_X509_PUBKEY_GET, X509_R_ERR_ASN1_LIB);
 		goto err;