From 758229f7d22775d7547e3b3b886b7f6a289c6897 Mon Sep 17 00:00:00 2001 From: Daniel DeFreez Date: Thu, 7 Feb 2019 09:55:14 -0800 Subject: [PATCH] Fix null pointer dereference in ssl_module_init CLA: Trivial Reviewed-by: Paul Yang Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/8183) --- crypto/conf/conf_ssl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crypto/conf/conf_ssl.c b/crypto/conf/conf_ssl.c index a1b24b22e2..d703f73630 100644 --- a/crypto/conf/conf_ssl.c +++ b/crypto/conf/conf_ssl.c @@ -78,6 +78,8 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf) cnt = sk_CONF_VALUE_num(cmd_lists); ssl_module_free(md); ssl_names = OPENSSL_zalloc(sizeof(*ssl_names) * cnt); + if (ssl_names == NULL) + goto err; ssl_names_count = cnt; for (i = 0; i < ssl_names_count; i++) { struct ssl_conf_name_st *ssl_name = ssl_names + i; -- 2.34.1