From 9dbfb11d5a204badbc28dec27cb98121bb00f996 Mon Sep 17 00:00:00 2001 From: Pauli Date: Mon, 27 Apr 2020 08:42:20 +1000 Subject: [PATCH] coverity 1462554 Dereference after null check Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/11651) --- crypto/evp/p_lib.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 053c9cb557..bbeb7276fe 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -1212,10 +1212,12 @@ static int pkey_set_type(EVP_PKEY *pkey, ENGINE *e, int type, const char *str, * to the |save_type| field, because |type| is supposed to be set * to EVP_PKEY_NONE in that case. */ - if (keymgmt != NULL) - pkey->save_type = ameth->pkey_id; - else if (pkey->ameth != NULL) - pkey->type = ameth->pkey_id; + if (ameth != NULL) { + if (keymgmt != NULL) + pkey->save_type = ameth->pkey_id; + else if (pkey->ameth != NULL) + pkey->type = ameth->pkey_id; + } #endif } return 1; -- 2.25.1