From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 22 Aug 2002 21:53:49 +0000 (+0000)
Subject: Fix crahses and leaks in pkcs12 utility -chain option
X-Git-Tag: OpenSSL_0_9_6h~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9370c84361ded5ec7419f4175e0ffc84399e2013;p=openssl

Fix crahses and leaks in pkcs12 utility -chain option
---

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index aeba62ea08..f53b44721e 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -480,9 +480,10 @@ int MAIN(int argc, char **argv)
 		    /* Exclude verified certificate */
 		    for (i = 1; i < sk_X509_num (chain2) ; i++) 
 			sk_X509_push(certs, sk_X509_value (chain2, i));
-		}
-		sk_X509_free(chain2);
-		if (vret) {
+		    /* Free first certificate */
+		    X509_free(sk_X509_value(chain2, 0));
+		    sk_X509_free(chain2);
+		} else {
 			BIO_printf (bio_err, "Error %s getting chain.\n",
 					X509_verify_cert_error_string(vret));
 			goto export_end;
@@ -509,8 +510,6 @@ int MAIN(int argc, char **argv)
 	}
 	sk_X509_pop_free(certs, X509_free);
 	certs = NULL;
-	/* ucert is part of certs so it is already freed */
-	ucert = NULL;
 
 #ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();
@@ -598,7 +597,6 @@ int MAIN(int argc, char **argv)
 	if (certs) sk_X509_pop_free(certs, X509_free);
 	if (safes) sk_PKCS7_pop_free(safes, PKCS7_free);
 	if (bags) sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
-	if (ucert) X509_free(ucert);
 
 #ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();