From: Pauli <pauli@openssl.org>
Date: Tue, 19 Jul 2022 01:04:32 +0000 (+1000)
Subject: Coverity 1507372: explicit null dereference
X-Git-Tag: openssl-3.2.0-alpha1~2359
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d768f853bb05b5a49a2aeb5b5702776834e68d06;p=thirdparty%2Fopenssl.git

Coverity 1507372: explicit null dereference

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/18822)
---

diff --git a/test/evp_extra_test2.c b/test/evp_extra_test2.c
index b2ffe1d7928..86337b281b3 100644
--- a/test/evp_extra_test2.c
+++ b/test/evp_extra_test2.c
@@ -346,9 +346,8 @@ static int test_dh_tofrom_data_select(void)
           && TEST_int_gt(EVP_PKEY_generate(gctx, &key), 0)
           && TEST_true(do_pkey_tofrom_data_select(key, "DHX"));
 # ifndef OPENSSL_NO_DEPRECATED_3_0
-    dhkey = EVP_PKEY_get0_DH(key);
-    ret = ret && TEST_ptr(dhkey);
-    ret = ret && TEST_ptr(privkey = DH_get0_priv_key(dhkey))
+    ret = ret && TEST_ptr(dhkey = EVP_PKEY_get0_DH(key))
+              && TEST_ptr(privkey = DH_get0_priv_key(dhkey))
               && TEST_int_le(BN_num_bits(privkey), 225);
 # endif
     EVP_PKEY_free(key);