[openssl-commits] [openssl] master update

[yang.yang at baishancloud.com]

The branch master has been updated
       via  34f5c8b1ff7b9a9a15f6a71c22fe83c2762b99d9 (commit)
      from  6ef40f1fc08f0c4ffb08438d63eed83eae7eb2b8 (commit)


- Log -----------------------------------------------------------------
commit 34f5c8b1ff7b9a9a15f6a71c22fe83c2762b99d9
Author: Paul Yang <yang.yang at baishancloud.com>
Date:   Thu Sep 13 11:17:14 2018 +0900

    Make some return checks consistent with others
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/7209)

-----------------------------------------------------------------------

Summary of changes:
 crypto/evp/pmeth_lib.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 633cb88..7fbf895 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -837,21 +837,21 @@ void EVP_PKEY_meth_get_ctrl(const EVP_PKEY_METHOD *pmeth,
 void EVP_PKEY_meth_get_check(const EVP_PKEY_METHOD *pmeth,
                              int (**pcheck) (EVP_PKEY *pkey))
 {
-    if (*pcheck)
+    if (pcheck != NULL)
         *pcheck = pmeth->check;
 }
 
 void EVP_PKEY_meth_get_public_check(const EVP_PKEY_METHOD *pmeth,
                                     int (**pcheck) (EVP_PKEY *pkey))
 {
-    if (*pcheck)
+    if (pcheck != NULL)
         *pcheck = pmeth->public_check;
 }
 
 void EVP_PKEY_meth_get_param_check(const EVP_PKEY_METHOD *pmeth,
                                    int (**pcheck) (EVP_PKEY *pkey))
 {
-    if (*pcheck)
+    if (pcheck != NULL)
         *pcheck = pmeth->param_check;
 }