From: Pauli <paul.dale@oracle.com>
Date: Wed, 20 Nov 2019 03:14:39 +0000 (+1000)
Subject: EVP p_lib: Add NULL check to EVP_PKEY_missing_parameters.
X-Git-Tag: OpenSSL_1_1_1e~134
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f6f371d472262e9525107074d93828b68acdbbdf;p=oweals%2Fopenssl.git

EVP p_lib: Add NULL check to EVP_PKEY_missing_parameters.

Check for NULL and return error if so.
This can possibly be called from apps/ca.c with a NULL argument.

Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
(Merged from https://github.com/openssl/openssl/pull/10474)

(cherry picked from commit ab5c77b4766e0992751d86560193ca42b49cf316)
---

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 72a23b4d5f..451bc95eae 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -102,7 +102,7 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
 
 int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)
 {
-    if (pkey->ameth && pkey->ameth->param_missing)
+    if (pkey != NULL && pkey->ameth && pkey->ameth->param_missing)
         return pkey->ameth->param_missing(pkey);
     return 0;
 }