Prevent localize from throwing exceptions #876

(cherry picked from commit 3b45822)
EOSIO · Jan 4, 2018 · b9f32ab · b9f32ab
1 parent a6c5e20
commit b9f32ab
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/programs/eosioc/localize.hpp b/programs/eosioc/localize.hpp
@@ -15,6 +15,13 @@ namespace eosio { namespace client { namespace localize {
    #define localized(str, ...) localized_with_variant((str), fc::mutable_variant_object() __VA_ARGS__ )
 
    inline auto localized_with_variant( const char* raw_fmt, const fc::variant_object& args) {
-      return fc::format_string(::gettext(raw_fmt), args);
+      if (raw_fmt != nullptr) {
+         try {
+            return fc::format_string(::gettext(raw_fmt), args);
+         } catch (...) {
+         }
+         return std::string(raw_fmt);
+      }
+      return std::string();
    }
-}}}
+}}}