From 51a9a47c19f3d9c5da197e2fd3ee985fe2cfaeac Mon Sep 17 00:00:00 2001
From: jsg <>
Date: Thu, 17 Apr 2014 17:30:22 +0000
Subject: fix some of the leaks ok miod@ looks good deraadt@

---
 src/lib/libcrypto/pem/pvkfmt.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/pem')

diff --git a/src/lib/libcrypto/pem/pvkfmt.c b/src/lib/libcrypto/pem/pvkfmt.c
index 8da8e77973..59af2020ab 100644
--- a/src/lib/libcrypto/pem/pvkfmt.c
+++ b/src/lib/libcrypto/pem/pvkfmt.c
@@ -753,8 +753,10 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in,
 			return NULL;
 			}
 		if (!derive_pvk_key(keybuf, p, saltlen,
-			    (unsigned char *)psbuf, inlen))
+			    (unsigned char *)psbuf, inlen)) {
+			free(enctmp);
 			return NULL;
+		}
 		p += saltlen;
 		/* Copy BLOBHEADER across, decrypt rest */
 		memcpy(enctmp, p, 8);
-- 
cgit v1.2.3-55-g6feb