From: Shane Lontis <shane.lontis@oracle.com>
Date: Mon, 24 Aug 2020 02:02:02 +0000 (+1000)
Subject: Fix coverity CID #1465967 & #1465968 - fix NULL dereference in dh_ameth.c
X-Git-Tag: openssl-3.0.0-alpha7~386
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d135774e7d4304df90eab0ed37e93ecdfb1b99a9;p=thirdparty%2Fopenssl.git

Fix coverity CID #1465967 & #1465968 - fix NULL dereference in dh_ameth.c

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/12708)
---

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)