Merge #9112: Avoid ugly exception in log on unknown inv type

laanwj · laanwj · commit 46027e8668ec · 2016-11-11T10:58:58.000+01:00
e9f25dd Avoid ugly exception in log on unknown inv type (Wladimir J. van der Laan)
diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -181,7 +181,11 @@ std::string CInv::GetCommand() const
 
 std::string CInv::ToString() const
 {
-    return strprintf("%s %s", GetCommand(), hash.ToString());
+    try {
+        return strprintf("%s %s", GetCommand(), hash.ToString());
+    } catch(const std::out_of_range &) {
+        return strprintf("0x%08x %s", type, hash.ToString());
+    }
 }
 
 const std::vector<std::string> &getAllNetMessageTypes()

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,11 @@ std::string CInv::GetCommand() const`
`181`	`181`
`182`	`182`	`std::string CInv::ToString() const`
`183`	`183`	`{`
`184`		`- return strprintf("%s %s", GetCommand(), hash.ToString());`
	`184`	`+ try {`
	`185`	`+ return strprintf("%s %s", GetCommand(), hash.ToString());`
	`186`	`+ } catch(const std::out_of_range &) {`
	`187`	`+ return strprintf("0x%08x %s", type, hash.ToString());`
	`188`	`+ }`
`185`	`189`	`}`
`186`	`190`
`187`	`191`	`const std::vector<std::string> &getAllNetMessageTypes()`