From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Sat, 18 Feb 2017 17:43:01 +0000 (+0300)
Subject: Fix memory leak in pkcs12 -export
X-Git-Tag: OpenSSL_1_1_0f~222
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cc0a813f23136fb1f1aff8bf4cdc831ae3d360d4;p=oweals%2Fopenssl.git

Fix memory leak in pkcs12 -export

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2676)
(cherry picked from commit 1b8f19379a521ec11ce37e12316dd3edc0acfb82)
---

diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
index d6b891920c..899a12e134 100644
--- a/crypto/pkcs12/p12_mutl.c
+++ b/crypto/pkcs12/p12_mutl.c
@@ -204,6 +204,9 @@ int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
 {
     X509_ALGOR *macalg;
 
+    PKCS12_MAC_DATA_free(p12->mac);
+    p12->mac = NULL;
+
     if ((p12->mac = PKCS12_MAC_DATA_new()) == NULL)
         return PKCS12_ERROR;
     if (iter > 1) {