From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 19 Dec 2014 15:30:10 +0000 (+0100)
Subject: pki: Properly clean up if output format for --pkcs12 is wrong
X-Git-Tag: 5.2.2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6c0dec0e5dfe86e2e9ebe6ea09f43f43ae7fab4;p=thirdparty%2Fstrongswan.git

pki: Properly clean up if output format for --pkcs12 is wrong
---

diff --git a/src/pki/commands/pkcs12.c b/src/pki/commands/pkcs12.c
index fe92fa810c..67f0268432 100644
--- a/src/pki/commands/pkcs12.c
+++ b/src/pki/commands/pkcs12.c
@@ -75,6 +75,7 @@ static int export(pkcs12_t *pkcs12, int index, char *outform)
 			form = CERT_ASN1_DER;
 			if (outform && !get_form(outform, &form, CRED_CERTIFICATE))
 			{
+				enumerator->destroy(enumerator);
 				return command_usage("invalid output format");
 			}
 			if (cert->get_encoding(cert, form, &encoding))
@@ -103,6 +104,7 @@ static int export(pkcs12_t *pkcs12, int index, char *outform)
 			form = PRIVKEY_ASN1_DER;
 			if (outform && !get_form(outform, &form, CRED_PRIVATE_KEY))
 			{
+				enumerator->destroy(enumerator);
 				return command_usage("invalid output format");
 			}
 			if (key->get_encoding(key, form, &encoding))