[openssl-commits] [openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  758229f7d22775d7547e3b3b886b7f6a289c6897 (commit)
      from  1980ce45d6bdd2b57df7003d6b56b5df560b9064 (commit)


- Log -----------------------------------------------------------------
commit 758229f7d22775d7547e3b3b886b7f6a289c6897
Author: Daniel DeFreez <daniel at defreez.com>
Date:   Thu Feb 7 09:55:14 2019 -0800

    Fix null pointer dereference in ssl_module_init
    
    CLA: Trivial
    
    Reviewed-by: Paul Yang <yang.yang at baishancloud.com>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/8183)

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

Summary of changes:
 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 a1b24b2..d703f73 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;