Merge pull request #493

f3724ae Fix startup crash when using a locale boost does not like (moneromooo-monero)
0c1dae3 i18n: allow language to be passed as a parameter (moneromooo-monero)

1 files changed, 19 insertions, 0 deletions

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 7d39bc4f4..4c1b44004 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -43,6 +43,7 @@ using namespace epee;
 #else 
 #include <sys/utsname.h>
 #endif
+#include <boost/filesystem.hpp>
 
 
 namespace tools
@@ -389,4 +390,22 @@ std::string get_nix_version_display_string()
 #endif
     return std::error_code(code, std::system_category());
   }
+
+  bool sanitize_locale()
+  {
+    // boost::filesystem throws for "invalid" locales, such as en_US.UTF-8, or kjsdkfs,
+    // so reset it here before any calls to it
+    try
+    {
+      boost::filesystem::path p {std::string("test")};
+      p /= std::string("test");
+    }
+    catch (...)
+    {
+      setenv("LC_ALL", "C", 1);
+      setenv("LANG", "C", 1);
+      return true;
+    }
+    return false;
+  }
 }