From 12da26e47a55c7af81f09554e03ff807fac431a8 Mon Sep 17 00:00:00 2001 From: Alexander Shaduri Date: Tue, 5 Jan 2021 16:25:21 +0400 Subject: [PATCH] Fixed a crash when system locale is set to invalid locale. Signed-off-by: Alexander Shaduri --- src/applib/storage_property.cpp | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/applib/storage_property.cpp b/src/applib/storage_property.cpp index aa0d656..152c797 100644 --- a/src/applib/storage_property.cpp +++ b/src/applib/storage_property.cpp @@ -43,7 +43,12 @@ std::string StorageAttribute::format_raw_value() const // If it's fully a number, format it with commas if (hz::number_to_string(raw_value_int) == raw_value) { std::stringstream ss; - ss.imbue(std::locale("")); + try { + ss.imbue(std::locale("")); + } + catch (const std::runtime_error& e) { + // something is wrong with system locale, can't do anything here. + } ss << std::fixed << raw_value_int; return ss.str(); } @@ -71,7 +76,12 @@ std::string StorageStatistic::format_value() const // If it's fully a number, format it with commas if (hz::number_to_string(value_int) == value) { std::stringstream ss; - ss.imbue(std::locale("")); + try { + ss.imbue(std::locale("")); + } + catch (const std::runtime_error& e) { + // something is wrong with system locale, can't do anything here. + } ss << std::fixed << value_int; return ss.str(); } @@ -153,7 +163,12 @@ int StorageErrorBlock::get_warning_level_for_error_type(std::string& type) std::string StorageErrorBlock::format_lifetime_hours() const { std::stringstream ss; - ss.imbue(std::locale("")); + try { + ss.imbue(std::locale("")); + } + catch (const std::runtime_error& e) { + // something is wrong with system locale, can't do anything here. + } ss << std::fixed << lifetime_hours; return ss.str(); } @@ -173,7 +188,12 @@ std::ostream& operator<< (std::ostream& os, const StorageErrorBlock& b) std::string StorageSelftestEntry::format_lifetime_hours() const { std::stringstream ss; - ss.imbue(std::locale("")); + try { + ss.imbue(std::locale("")); + } + catch (const std::runtime_error& e) { + // something is wrong with system locale, can't do anything here. + } ss << std::fixed << lifetime_hours; return ss.str(); }