coverity 1462572 Dereference after null check

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11651)

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 1a23ae08461b83b1c95296eb1d380afa2bd95137..6facdf3e5b27b9057ab5e1098d1e999795004b98 100644 (file)
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -420,9 +420,13 @@ static int load_pkcs12(BIO *in, const char *desc,
     char tpass[PEM_BUFSIZE];
     int len, ret = 0;
     PKCS12 *p12;
+
     p12 = d2i_PKCS12_bio(in, NULL);
-    if (p12 == NULL && desc != NULL) {
-        BIO_printf(bio_err, "Error loading PKCS12 file for %s\n", desc);
+    if (p12 == NULL) {
+        if (desc != NULL)
+            BIO_printf(bio_err, "Error loading PKCS12 file for %s\n", desc);
+        else
+            BIO_printf(bio_err, "Error loading PKCS12 file\n");
         goto die;
     }
     /* See if an empty password will do */