summaryrefslogtreecommitdiffstats
path: root/crypto/conf
diff options
context:
space:
mode:
authorRoumen Petrov <openssl@roumenpetrov.info>2016-02-12 21:18:59 +0100
committerRich Salz <rsalz@openssl.org>2016-02-18 16:25:23 +0100
commit4015adf0a3d352cc4013c722f1b2d5374989ac4c (patch)
tree7e592a12200b97d7c8e7014599960309049e081d /crypto/conf
parentFix memory leaks in tls_decrypt_ticket (diff)
downloadopenssl-4015adf0a3d352cc4013c722f1b2d5374989ac4c.tar.xz
openssl-4015adf0a3d352cc4013c722f1b2d5374989ac4c.zip
Fix OPENSSL_config with NULL parameter
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/conf')
-rw-r--r--crypto/conf/conf_sap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index 2021a02c5d..e70fb7a738 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