From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 17 May 2006 18:25:38 +0000 (+0000)
Subject: Fix from head.
X-Git-Tag: OpenSSL_0_9_7k~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6651ac386eabc6e4196964c5fdaf64dcdda29088;p=oweals%2Fopenssl.git

Fix from head.
---

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index c961e6b57b..300b20b250 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -873,10 +873,12 @@ int alg_print (BIO *x, X509_ALGOR *alg)
 	unsigned char *p;
 	p = alg->parameter->value.sequence->data;
 	pbe = d2i_PBEPARAM (NULL, &p, alg->parameter->value.sequence->length);
+	if (!pbe)
+		return 1;
 	BIO_printf (bio_err, "%s, Iteration %d\n", 
 	OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)), ASN1_INTEGER_get(pbe->iter));
 	PBEPARAM_free (pbe);
-	return 0;
+	return 1;
 }
 
 /* Load all certificates from a given file */