From 737d7e8d3945c206c037e139055821aa0c64bb8e Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 3 Dec 2015 17:22:58 +0000
Subject: Import OpenSSL 1.0.2e.

---
 crypto/evp/p_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crypto/evp/p_lib.c')

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 1171d3086d0b2..c0171244d5d01 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -253,7 +253,7 @@ int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len)
 
 int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
 {
-    if (!EVP_PKEY_set_type(pkey, type))
+    if (pkey == NULL || !EVP_PKEY_set_type(pkey, type))
         return 0;
     pkey->pkey.ptr = key;
     return (key != NULL);
-- 
cgit v1.2.3