diff options
author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-11-21 10:13:10 +0000 |
---|---|---|
committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-11-21 10:13:10 +0000 |
commit | f3724aef881ff2fdada98eddc792059e4e18c1c8 (patch) | |
tree | 492dc86b5344060870877c0a886f67d2c1eaa0b8 /src/common | |
parent | i18n: allow language to be passed as a parameter (diff) | |
download | monero-f3724aef881ff2fdada98eddc792059e4e18c1c8.tar.xz |
Fix startup crash when using a locale boost does not like
There are various locale related bugs in various versions of boost,
where exceptions are thrown in boost::filesystem APIs when the
current locale is not to boost's liking. It's not clear what "not
to boost's liking" means in detail, though "en" and "en_US.UTF-8"
are not to its liking.
Fix it by running a test function that's known to throw in such
a case, and resetting LANG and LC_ALL to C if an exception is
thrown. In simplewallet, the locale is queried before that so the
correct translations will still be used.
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/util.cpp | 19 | ||||
-rw-r--r-- | src/common/util.h | 2 |
2 files changed, 21 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; + } } diff --git a/src/common/util.h b/src/common/util.h index 883fe1e0f..236a0b6f0 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -88,6 +88,8 @@ namespace tools */ std::error_code replace_file(const std::string& replacement_name, const std::string& replaced_name); + bool sanitize_locale(); + inline crypto::hash get_proof_of_trust_hash(const nodetool::proof_of_trust& pot) { std::string s; |