aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrbandrews <bandrewsny@gmail.com>2016-06-02 14:43:18 -0400
committermrbandrews <bandrewsny@gmail.com>2016-06-02 14:43:18 -0400
commit12c5a16c4e635799cfb6cadbca79dfa83555da72 (patch)
treebef0c0207347c5201b380ff3e50a05ee592c8d55
parent291f8aa5daf80eed56d6cefa3d410652b412150a (diff)
downloadbitcoin-12c5a16c4e635799cfb6cadbca79dfa83555da72.tar.xz
Catch exceptions from non-canonical encoding and print only to log
-rw-r--r--src/main.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index ed157b53dc..885b1b56fb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5567,6 +5567,11 @@ bool ProcessMessages(CNode* pfrom)
// Allow exceptions from over-long size
LogPrintf("%s(%s, %u bytes): Exception '%s' caught\n", __func__, SanitizeString(strCommand), nMessageSize, e.what());
}
+ else if (strstr(e.what(), "non-canonical ReadCompactSize()"))
+ {
+ // Allow exceptions from non-canonical encoding
+ LogPrintf("%s(%s, %u bytes): Exception '%s' caught\n", __func__, SanitizeString(strCommand), nMessageSize, e.what());
+ }
else
{
PrintExceptionContinue(&e, "ProcessMessages()");