From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 9 Oct 2011 16:04:17 +0000 (+0000)
Subject: Fix memory leak. From HEAD.
X-Git-Tag: OpenSSL_1_0_1-beta1~137
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5473b6bc2fd4d3c09e5eaa29c1fb7745553069ef;p=oweals%2Fopenssl.git

Fix memory leak. From HEAD.
---

diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index b053a6efc0..4ea683036b 100644
--- a/crypto/asn1/p5_pbev2.c
+++ b/crypto/asn1/p5_pbev2.c
@@ -153,6 +153,8 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
 
 	/* Setup keyfunc */
 
+	X509_ALGOR_free(pbe2->keyfunc);
+
 	pbe2->keyfunc = PKCS5_pbkdf2_set(iter, salt, saltlen, prf_nid, keylen);
 
 	if (!pbe2->keyfunc)