[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  60c526975aecba7e7aa229a92624498b36abf971 (commit)
      from  b1bebbcb67325593f8af247582208940a4cc0332 (commit)


- Log -----------------------------------------------------------------
commit 60c526975aecba7e7aa229a92624498b36abf971
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Tue Aug 14 17:43:36 2018 -0400

    Deallocate previously loaded SSL CONF module data
    
    If application explicitly calls CONF_modules_load_file() the SSL
    conf module will be initialized twice and the module data would leak.
    We need to free it before initializing it again.
    
    Fixes #6835
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6948)

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

Summary of changes:
 crypto/conf/conf_ssl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/conf/conf_ssl.c b/crypto/conf/conf_ssl.c
index 015c46c..024bdb4 100644
--- a/crypto/conf/conf_ssl.c
+++ b/crypto/conf/conf_ssl.c
@@ -76,6 +76,7 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
         goto err;
     }
     cnt = sk_CONF_VALUE_num(cmd_lists);
+    ssl_module_free(md);
     ssl_names = OPENSSL_zalloc(sizeof(*ssl_names) * cnt);
     ssl_names_count = cnt;
     for (i = 0; i < ssl_names_count; i++) {