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

Fix from HEAD.
---

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index c22c00fce1..5205002041 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -825,12 +825,14 @@ int alg_print (BIO *x, X509_ALGOR *alg)
 	PBEPARAM *pbe;
 	const unsigned char *p;
 	p = alg->parameter->value.sequence->data;
-	pbe = d2i_PBEPARAM (NULL, &p, alg->parameter->value.sequence->length);
+	pbe = d2i_PBEPARAM(NULL, &p, alg->parameter->value.sequence->length);
+	if (!pbe)
+		return 1;
 	BIO_printf (bio_err, "%s, Iteration %ld\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 */