EVP p_lib: Add NULL check to EVP_PKEY_missing_parameters.
authorPauli <paul.dale@oracle.com>
Wed, 20 Nov 2019 03:14:39 +0000 (13:14 +1000)
committerPauli <paul.dale@oracle.com>
Thu, 21 Nov 2019 04:35:37 +0000 (14:35 +1000)
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)

crypto/evp/p_lib.c

index 72a23b4d5f8e06e74ecf8e086c14e4d427862c6d..451bc95eaec21914cee4fc1e3b44439c6fd9e7b4 100644 (file)
@@ -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;
 }