Uhmmm, if we use && after having tested for the presence of the certificate,

we just *might* stand a certain chance of actually getting it written
to file...

diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c
index dba1c430da1ca9e69c60c586f76a60bb05045c60..27bcc25177539821d12c1616da341e269a0a56e6 100644 (file)
--- a/crypto/pem/pem_info.c
+++ b/crypto/pem/pem_info.c
@@ -370,7 +370,7 @@ int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc,
                }
 
        /* if we have a certificate then write it out now */
-       if ((xi->x509 != NULL) || (PEM_write_bio_X509(bp,xi->x509) <= 0))
+       if ((xi->x509 != NULL) && (PEM_write_bio_X509(bp,xi->x509) <= 0))
                goto err;
 
        /* we are ignoring anything else that is loaded into the X509_INFO