aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2013-10-04 04:08:43 -0700
committerGavin Andresen <gavinandresen@gmail.com>2013-10-04 04:08:43 -0700
commit15b48ab03612952b355cdd411cc541668d147bfb (patch)
tree83a0dc09ad724689af4bc34675a6dac182a8e1bc
parentacb3ebc45506701fdb7e060d8b941a5ba6a1b5ac (diff)
parentfbed9c9d6356f86e5507b3fc032f263a17137d57 (diff)
Merge pull request #3047 from Diapolo/misbehave
special case DoS value == 0
-rw-r--r--src/main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 8df288380a..dcf0ee01ae 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3785,8 +3785,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
if (nEvicted > 0)
LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted);
}
- int nDoS;
- if (state.IsInvalid(nDoS))
+ int nDoS = 0;
+ if (state.IsInvalid(nDoS) && nDoS > 0)
pfrom->Misbehaving(nDoS);
}
@@ -3805,8 +3805,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
CValidationState state;
if (ProcessBlock(state, pfrom, &block))
mapAlreadyAskedFor.erase(inv);
- int nDoS;
- if (state.IsInvalid(nDoS))
+ int nDoS = 0;
+ if (state.IsInvalid(nDoS) && nDoS > 0)
pfrom->Misbehaving(nDoS);
}