diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-06-13 11:36:48 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-06-13 11:37:37 +0200 |
| commit | 44c1b1c9bb54082625c7ad76af25473abf79f866 (patch) | |
| tree | 0c9b8fb64cefc3b353258ac4c93be18e6ec7d153 /src/main.cpp | |
| parent | Merge #7598: Refactor CreateNewBlock to be a method of the BlockAssembler class (diff) | |
| parent | Tests: Edit bloated varint test and add option for 'barely expensive' tests (diff) | |
| download | discoin-44c1b1c9bb54082625c7ad76af25473abf79f866.tar.xz discoin-44c1b1c9bb54082625c7ad76af25473abf79f866.zip | |
Merge #8141: Continuing port of java comparison tool
ff2dcf2 Tests: Edit bloated varint test and add option for 'barely expensive' tests (mrbandrews)
12c5a16 Catch exceptions from non-canonical encoding and print only to log (mrbandrews)
291f8aa Continuing port of java comptool (mrbandrews)
8c9e681 Tests: Rework blockstore to avoid re-serialization. (mrbandrews)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index 6d006e878..6092e7a12 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5609,6 +5609,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()"); |