diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-04 09:10:25 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-04 09:10:31 +0100 |
| commit | d032b5b64b0d3dc74aa846da5da37047ed5a65ad (patch) | |
| tree | 29c999a66e93cf99f41c9f693beb2a5366072fbb | |
| parent | be9a9a3d2253ceccf123572b97a890c489a5a9be (diff) | |
| parent | 7ef8f3c072a8750c72a3a1cdc727b5c1d173bac8 (diff) | |
| download | bitcoin-d032b5b64b0d3dc74aa846da5da37047ed5a65ad.tar.xz | |
Merge pull request #7276
7ef8f3c Report non-mandatory script failures correctly (Pieter Wuille)
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index a43eef07b5..0766b1458b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1653,9 +1653,9 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi // arguments; if so, don't trigger DoS protection to // avoid splitting the network between upgraded and // non-upgraded nodes. - CScriptCheck check(*coins, tx, i, + CScriptCheck check2(*coins, tx, i, flags & ~STANDARD_NOT_MANDATORY_VERIFY_FLAGS, cacheStore); - if (check()) + if (check2()) return state.Invalid(false, REJECT_NONSTANDARD, strprintf("non-mandatory-script-verify-flag (%s)", ScriptErrorString(check.GetScriptError()))); } // Failures of other flags indicate a transaction that is |