Merge pull request BTCGPU#351 from h4x3rotab/cve-2018-17144

Fix CVE-2018-17144
nimblenode · Sep 19, 2018 · f8db148 · f8db148
2 parents 1fe6ed7 + 374e5a3
commit f8db148
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2868,7 +2868,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, true))
             return state.Invalid(false, state.GetRejectCode(), state.GetRejectReason(),
                                  strprintf("Transaction check failed (tx hash %s) %s", tx->GetHash().ToString(), state.GetDebugMessage()));
 

diff --git a/test/functional/invalidblockrequest.py b/test/functional/invalidblockrequest.py
@@ -97,6 +97,17 @@ def get_tests(self):
         yield TestInstance([[block2, RejectResult(16, b'bad-txns-duplicate')], [block2_orig, True]])
         height += 1
 
+
+        # Check transactions for duplicate inputs
+        self.log.info("Test duplicate input block.")
+
+        block2_orig.vtx[2].vin.append(block2_orig.vtx[2].vin[0])
+        block2_orig.vtx[2].rehash()
+        block2_orig.hashMerkleRoot = block2_orig.calc_merkle_root()
+        block2_orig.rehash()
+        block2_orig.solve()
+        yield TestInstance([[block2_orig, RejectResult(16, b'bad-txns-inputs-duplicate')]])
+
         '''
         Make sure that a totally screwed up block is not valid.
         '''