diff options
| author | Luke Dashjr <[email protected]> | 2012-05-04 18:55:15 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-05-04 18:55:15 +0000 |
| commit | b2e5f797b5670c4dc7d0dfd696d21977575fe9ed (patch) | |
| tree | 308157c6a728931ff26a8260e204c633e75ead1d /src/main.cpp | |
| parent | Check earlier for blocks with duplicate transactions. Fixes #1167 (diff) | |
| parent | Check earlier for blocks with duplicate transactions. Fixes #1167 (diff) | |
| download | discoin-b2e5f797b5670c4dc7d0dfd696d21977575fe9ed.tar.xz discoin-b2e5f797b5670c4dc7d0dfd696d21977575fe9ed.zip | |
Merge branch '0.4.x' into 0.5.x
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index 5f98d4953..ff4e2f0de 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1502,6 +1502,16 @@ bool CBlock::CheckBlock() const if (uniqueTx.size() != vtx.size()) return DoS(100, error("CheckBlock() : duplicate transaction")); + // 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 error("CheckBlock() : duplicate transaction"); + // Check that it's not full of nonstandard transactions if (GetSigOpCount() > MAX_BLOCK_SIGOPS) return DoS(100, error("CheckBlock() : out-of-bounds SigOpCount")); |