util: Throw tinyformat::format_error on formatting error

random-zebra · random-zebra · commit 9fb0a439b199 · 2020-03-23T11:00:08.000+01:00
backports bitcoin/bitcoin@b651270
diff --git a/src/tinyformat.h b/src/tinyformat.h
@@ -125,7 +125,7 @@ namespace tinyformat
 namespace tfm = tinyformat;
 
 // Error handling; calls assert() by default.
-#define TINYFORMAT_ERROR(reasonString) throw std::runtime_error(reasonString)
+#define TINYFORMAT_ERROR(reasonString) throw tinyformat::format_error(reasonString)
 
 // Define for C++11 variadic templates which make the code shorter & more
 // general.  If you don't define this, C++11 support is autodetected below.
@@ -166,6 +166,14 @@ namespace tfm = tinyformat;
 
 namespace tinyformat
 {
+
+class format_error: public std::runtime_error
+{
+public:
+    format_error(const std::string &what): std::runtime_error(what) {
+    }
+};
+
 //------------------------------------------------------------------------------
 namespace detail
 {
diff --git a/src/util.h b/src/util.h
@@ -69,7 +69,7 @@ template<typename... Args> std::string FormatStringFromLogArgs(const char *fmt,
     std::string _log_msg_; /* Unlikely name to avoid shadowing variables */         \
     try {                                                                           \
         _log_msg_ = tfm::format(__VA_ARGS__);                                       \
-    } catch (std::runtime_error &e) {                                               \
+    } catch (tinyformat::format_error &e) {                                               \
         /* Original format string will have newline so don't add one here */        \
         _log_msg_ = "Error \"" + std::string(e.what()) + "\" while formatting log message: " + FormatStringFromLogArgs(__VA_ARGS__); \
     }                                                                               \
