Merge pull request #321 from RavenProject/cve_2018-17144

fixes CVE-2018-17144 (#308)
RavenProject · Sep 21, 2018 · 3bb84b1 · 3bb84b1
2 parents 25d8378 + c828150
commit 3bb84b1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 4)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp
@@ -210,7 +210,6 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, CAssetsCa
     }
         /** RVN END */
 
-    // 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)

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -3360,7 +3360,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
 
     // Check transactions
     for (const auto& tx : block.vtx)
-        if (!CheckTransaction(*tx, state, passets, false))
+        if (!CheckTransaction(*tx, state, passets, true))
             return state.Invalid(false, state.GetRejectCode(), state.GetRejectReason(),
                                  strprintf("Transaction check failed (tx hash %s) %s %s", tx->GetHash().ToString(), state.GetDebugMessage(), state.GetRejectReason()));