Fix from HEAD.

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index c22c00fce156147fe9e0b121f4cecdd0c93079ba..5205002041f4b9b3530b7f9c4d7de791cda4b4e5 100644 (file)
--- 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 */