X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Finit.c;h=1bfde6973ceb41c114296ea50f2188f03fc336dd;hp=bce8438b9561d9b02515009e6223eb613606c001;hb=bf24111bb2cf37b609fecdbe81660ecfd460e998;hpb=8b75603cc0ce8f4d9deb7218fbd905d3fc73a4c0;ds=inline

diff --git a/crypto/init.c b/crypto/init.c
index bce8438b95..1bfde6973c 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -679,13 +679,17 @@ void OPENSSL_INIT_crypto_library_start(uint64_t opts,
     }
 
     if (opts & OPENSSL_INIT_LOAD_CONFIG) {
+        CRYPTO_w_lock(CRYPTO_LOCK_INIT);
         if (settings != NULL) {
             const OPENSSL_INIT_SETTINGS *curr;
             curr = ossl_init_get_setting(settings,
                                          OPENSSL_INIT_SET_CONF_FILENAME);
-            config_filename = curr == NULL ? NULL : curr->value.type_string;
+            config_filename = (curr == NULL) ? NULL : curr->value.type_string;
+        } else {
+            config_filename = NULL;
         }
         ossl_init_once_run(&config, ossl_init_config);
+        CRYPTO_w_unlock(CRYPTO_LOCK_INIT);
     }
 
     if (opts & OPENSSL_INIT_ASYNC) {