From d135774e7d4304df90eab0ed37e93ecdfb1b99a9 Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Mon, 24 Aug 2020 12:02:02 +1000 Subject: [PATCH] Fix coverity CID #1465967 & #1465968 - fix NULL dereference in dh_ameth.c Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/12708) --- crypto/dh/dh_ameth.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index 011bc5ad03a..3d4605ae11d 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -564,13 +564,12 @@ static int dh_pkey_import_from_type(const OSSL_PARAM params[], void *vpctx, EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(pctx); DH *dh = dh_new_with_libctx(pctx->libctx); - DH_clear_flags(dh, DH_FLAG_TYPE_MASK); - DH_set_flags(dh, type == EVP_PKEY_DH ? DH_FLAG_TYPE_DH : DH_FLAG_TYPE_DHX); - if (dh == NULL) { ERR_raise(ERR_LIB_DH, ERR_R_MALLOC_FAILURE); return 0; } + DH_clear_flags(dh, DH_FLAG_TYPE_MASK); + DH_set_flags(dh, type == EVP_PKEY_DH ? DH_FLAG_TYPE_DH : DH_FLAG_TYPE_DHX); if (!dh_ffc_params_fromdata(dh, params) || !dh_key_fromdata(dh, params) -- 2.47.3