From c88030807e5ccff26c7d79c1dd9144eb787a8f65 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 30 Apr 2019 10:25:56 +0200
Subject: [PATCH] pki: Fix memory leaks in --signcrl if signature scheme is not
 found

Fixes: dd4bd21c5a22 ("pki: Query private key for supported signature schemes")
---
 src/pki/commands/signcrl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pki/commands/signcrl.c b/src/pki/commands/signcrl.c
index a399d21be..8c234feb6 100644
--- a/src/pki/commands/signcrl.c
+++ b/src/pki/commands/signcrl.c
@@ -416,9 +416,6 @@ static int sign_crl()
 			BUILD_CRL_DISTRIBUTION_POINTS, cdps, BUILD_BASE_CRL, baseCrlNumber,
 			BUILD_END);
 	enumerator->destroy(enumerator);
-	lastenum->destroy(lastenum);
-	DESTROY_IF((certificate_t*)lastcrl);
-	free(crl_serial.ptr);
 
 	if (!crl)
 	{
@@ -442,9 +439,12 @@ error:
 	DESTROY_IF(private);
 	DESTROY_IF(ca);
 	DESTROY_IF(crl);
+	DESTROY_IF(lastenum);
+	DESTROY_IF((certificate_t*)lastcrl);
 	signature_params_destroy(scheme);
 	free(encoding.ptr);
 	free(baseCrlNumber.ptr);
+	free(crl_serial.ptr);
 	list->destroy_function(list, (void*)revoked_destroy);
 	cdps->destroy_function(cdps, (void*)x509_cdp_destroy);
 	if (error)