diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-01-03 16:50:31 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-04 09:13:09 +0100 |
| commit | 76de36fd2e2bd733fcab68314f6d67704d2047d1 (patch) | |
| tree | 670ca385dfceca52cb2eef781af868a7bd0f0e4f /src | |
| parent | 453c56701a14d571b93edb4352f6dbfa258c3c44 (diff) | |
| download | bitcoin-76de36fd2e2bd733fcab68314f6d67704d2047d1.tar.xz | |
Report non-mandatory script failures correctly
Github-Pull: #7276
Rebased-From: 7ef8f3c072a8750c72a3a1cdc727b5c1d173bac8
Diffstat (limited to 'src')
| -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 7bc025308b..f24306b6e4 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 |