diff options
| author | Pauli <paul.dale@oracle.com> | 2020-04-27 09:16:04 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-04-30 20:21:33 +1000 |
| commit | cb383f10d1fe5e9020280952caea4fa9c2e4139d (patch) | |
| tree | 55e8bfa2f78f4314f560f911ffc02f869f4215b3 /apps | |
| parent | 61cdc2a08dcd6d4805dab21483974cc82b88d6e3 (diff) | |
coverity 1462572 Dereference after null check
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11651)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/lib/apps.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/lib/apps.c b/apps/lib/apps.c index 1a23ae0846..6facdf3e5b 100644 --- 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 */ |