Merge pull request bitshares#211 from xloem/static-segfault

fix for static initialization order segfault
cdfr1 · Sep 28, 2020 · 2cb7bf1 · 2cb7bf1
2 parents 781c9cd + 95cc8ce
commit 2cb7bf1
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/crypto/openssl.cpp b/src/crypto/openssl.cpp
@@ -12,17 +12,21 @@ namespace  fc
 {
     struct openssl_scope
     {
-       static path _configurationFilePath;
+       static path & _configurationFilePath()
+       {
+          static path orderindependentstorage;
+          return orderindependentstorage;
+       }
        openssl_scope()
        {
           ERR_load_crypto_strings(); 
           OpenSSL_add_all_algorithms();
 
-          const boost::filesystem::path& boostPath = _configurationFilePath;
+          const boost::filesystem::path& boostPath = _configurationFilePath();
           if(boostPath.empty() == false)
           {
             std::string varSetting("OPENSSL_CONF=");
-            varSetting += _configurationFilePath.to_native_ansi_path();
+            varSetting += _configurationFilePath().to_native_ansi_path();
 #if defined(WIN32)
             _putenv((char*)varSetting.c_str());
 #else
@@ -51,11 +55,9 @@ namespace  fc
        }
     };
 
-    path openssl_scope::_configurationFilePath;
-
     void store_configuration_path(const path& filePath)
     {
-      openssl_scope::_configurationFilePath = filePath;
+      openssl_scope::_configurationFilePath() = filePath;
     }
 
     int init_openssl()