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 4c2bd4e5c8a1e0cf747b10b662c114031285ac85..d0fd73209890410cf5aab9a93565da1e583627a7 100644 (file)
--- 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 c32a6eaa49c6dd2dada0028c5f7797f921ab1acd..01698dd21730b32cadfb86477950188918740f49 100644 (file)
--- 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;