[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  4015adf0a3d352cc4013c722f1b2d5374989ac4c (commit)
      from  35b1a433ed893f29adff490ad06160eaa86c2416 (commit)


- Log -----------------------------------------------------------------
commit 4015adf0a3d352cc4013c722f1b2d5374989ac4c
Author: Roumen Petrov <openssl at roumenpetrov.info>
Date:   Fri Feb 12 22:18:59 2016 +0200

    Fix OPENSSL_config with NULL parameter
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/conf/conf_sap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index 2021a02..e70fb7a 100644
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -81,7 +81,8 @@ void OPENSSL_config(const char *config_name)
     OPENSSL_INIT_SETTINGS settings;
 
     memset(&settings, 0, sizeof(settings));
-    settings.config_name = strdup(config_name);
+    if (config_name != NULL)
+        settings.config_name = strdup(config_name);
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, &settings);
 }
 #endif