aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2013-04-14 17:40:49 -0700
committerGavin Andresen <gavinandresen@gmail.com>2013-04-14 17:40:49 -0700
commita3e7577a8199d95f0035570195f68a1acb2fa86e (patch)
tree18f768c4fcc2702e8ac465f192ba262cdf4a544b
parent463a58ae75c817a1f81d439167d1ec9229263312 (diff)
parent20d0810f300fdcb6a0af6cb310c4702cdd956009 (diff)
downloadbitcoin-a3e7577a8199d95f0035570195f68a1acb2fa86e.tar.xz
Merge pull request #2520 from sipa/strictmempool
Require strictly-standard encodings in mempool
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index bf13e79151..6f3b5da961 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -768,7 +768,7 @@ bool CTxMemPool::accept(CValidationState &state, CTransaction &tx, bool fCheckIn
// Check against previous transactions
// This is done last to help prevent CPU exhaustion denial-of-service attacks.
- if (!tx.CheckInputs(state, view, true, SCRIPT_VERIFY_P2SH))
+ if (!tx.CheckInputs(state, view, true, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC))
{
return error("CTxMemPool::accept() : ConnectInputs failed %s", hash.ToString().c_str());
}