Fix crash bug with duplicate inputs within a transaction

Duality-CDOO · Duality-CDOO · commit f796bb8882ca · 2018-11-22T14:46:17.000+01:00
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -534,7 +534,7 @@ int GetUTXOConfirmations(const COutPoint& outpoint)
 }
 
 
-bool CheckTransaction(const CTransaction& tx, CValidationState& state, bool fCheckDuplicateInputs)
+bool CheckTransaction(const CTransaction& tx, CValidationState& state)
 {
     // Basic checks that don't depend on any context
     if (tx.vin.empty())
@@ -563,13 +563,12 @@ bool CheckTransaction(const CTransaction& tx, CValidationState& state, bool fChe
         }
     }
 
-    // Check for duplicate inputs - note that this check is slow so we skip it in CheckBlock
-    if (fCheckDuplicateInputs) {
-        std::set<COutPoint> vInOutPoints;
-        for (const auto& txin : tx.vin) {
-            if (!vInOutPoints.insert(txin.prevout).second)
-                return state.DoS(100, false, REJECT_INVALID, "bad-txns-inputs-duplicate");
-        }
+    // Check for duplicate inputs
+    std::set<COutPoint> vInOutPoints;
+    for (const auto& txin : tx.vin)
+    {
+        if (!vInOutPoints.insert(txin.prevout).second)
+            return state.DoS(100, false, REJECT_INVALID, "bad-txns-inputs-duplicate");
     }
 
     if (tx.IsCoinBase()) {
@@ -3414,7 +3413,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
 
     // Check transactions
     for (const auto& tx : block.vtx) {
-        if (!CheckTransaction(*tx, state, false))
+        if (!CheckTransaction(*tx, state))
             return state.Invalid(false, state.GetRejectCode(), state.GetRejectReason(),
                 strprintf("Transaction check failed (tx hash %s) %s", tx->GetHash().ToString(), state.GetDebugMessage()));
 
diff --git a/src/validation.h b/src/validation.h
@@ -385,7 +385,7 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);
 /** Transaction validation functions */
 
 /** Context-independent validity checks */
-bool CheckTransaction(const CTransaction& tx, CValidationState& state, bool fCheckDuplicateInputs = true);
+bool CheckTransaction(const CTransaction& tx, CValidationState& state);
 
 namespace Consensus
 {

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);`
`385`	`385`	`/** Transaction validation functions */`
`386`	`386`
`387`	`387`	`/** Context-independent validity checks */`
`388`		`-bool CheckTransaction(const CTransaction& tx, CValidationState& state, bool fCheckDuplicateInputs = true);`
	`388`	`+bool CheckTransaction(const CTransaction& tx, CValidationState& state);`
`389`	`389`
`390`	`390`	`namespace Consensus`
`391`	`391`	`{`