aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-04-29 20:56:55 -0400
committerGavin Andresen <gavinandresen@gmail.com>2012-04-30 11:08:07 -0400
commitbe8651dde7b59e50e8c443da71c706667803d06d (patch)
tree357c7714553fa88b628fb85e88b9627b063e2e54
parentec4997d48f825c35c7f2047e8ef27ed791221edf (diff)
Check earlier for blocks with duplicate transactions. Fixes #1167v0.6.1rc2
-rw-r--r--src/main.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index e5d110d8ef..427e435a90 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1652,6 +1652,16 @@ bool CBlock::CheckBlock() const
if (!tx.CheckTransaction())
return DoS(tx.nDoS, error("CheckBlock() : CheckTransaction failed"));
+ // Check for duplicate txids. This is caught by ConnectInputs(),
+ // but catching it earlier avoids a potential DoS attack:
+ set<uint256> uniqueTx;
+ BOOST_FOREACH(const CTransaction& tx, vtx)
+ {
+ uniqueTx.insert(tx.GetHash());
+ }
+ if (uniqueTx.size() != vtx.size())
+ return DoS(100, error("CheckBlock() : duplicate transaction"));
+
unsigned int nSigOps = 0;
BOOST_FOREACH(const CTransaction& tx, vtx)
{