From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 28 Feb 2014 17:00:38 +0000 (+0000)
Subject: Fix memory leak.
X-Git-Tag: master-post-reformat~913
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=01757858feb3590b175b40d7e0e73da8255d6c50

Fix memory leak.
(cherry picked from commit 124d218889dfca33d277404612f1319afe04107e)
---

diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
index 9d3557e8d7..992efc0bd4 100644
--- a/crypto/pkcs12/p12_decr.c
+++ b/crypto/pkcs12/p12_decr.c
@@ -158,27 +158,31 @@ ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *i
 				       const char *pass, int passlen,
 				       void *obj, int zbuf)
 {
-	ASN1_OCTET_STRING *oct;
+	ASN1_OCTET_STRING *oct = NULL;
 	unsigned char *in = NULL;
 	int inlen;
 	if (!(oct = M_ASN1_OCTET_STRING_new ())) {
 		PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT,ERR_R_MALLOC_FAILURE);
-		return NULL;
+		goto err;
 	}
 	inlen = ASN1_item_i2d(obj, &in, it);
 	if (!in) {
 		PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT,PKCS12_R_ENCODE_ERROR);
-		return NULL;
+		goto err;
 	}
 	if (!PKCS12_pbe_crypt(algor, pass, passlen, in, inlen, &oct->data,
 				 &oct->length, 1)) {
 		PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT,PKCS12_R_ENCRYPT_ERROR);
 		OPENSSL_free(in);
-		return NULL;
+		goto err;
 	}
 	if (zbuf) OPENSSL_cleanse(in, inlen);
 	OPENSSL_free(in);
 	return oct;
+	err:
+	if (oct)
+		ASN1_OCTET_STRING_free(oct);
+	return NULL;
 }
 
 IMPLEMENT_PKCS12_STACK_OF(PKCS7)