Commit f7a397cc authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

Avoid possible memory leaks in error-handling. 

Submitted by: Nils Larsch
Reviewed by: Geoff Thorpe
parent cd2e8a6f

crypto/asn1/d2i_pu.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

crypto/asn1/x_pubkey.c

+1 −1
Original line number Diff line number Diff line
@@ -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;