diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-19 17:15:36 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-19 17:41:34 +0200 |
| commit | 475d68252e9c469393da92e4cd0e6caa428b4364 (patch) | |
| tree | 28e6e3af169688cc0cbe79e6fe63fd6b8b41917a /src/script | |
| parent | 3e942a7060fed368f82add85177337361f6e8edd (diff) | |
| parent | acf853df910339412bafb1743f42af1774f5b910 (diff) | |
| download | bitcoin-475d68252e9c469393da92e4cd0e6caa428b4364.tar.xz | |
Merge #8927: Add script tests for FindAndDelete in pre-segwit and segwit scripts
acf853d Add script tests for FindAndDelete in pre-segwit and segwit scripts (Johnson Lau)
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/interpreter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 836cf9ee35..0e17ddc130 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -890,7 +890,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un // Subset of script starting at the most recent codeseparator CScript scriptCode(pbegincodehash, pend); - // Drop the signature, since there's no way for a signature to sign itself + // Drop the signature in pre-segwit scripts but not segwit scripts if (sigversion == SIGVERSION_BASE) { scriptCode.FindAndDelete(CScript(vchSig)); } @@ -951,7 +951,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un // Subset of script starting at the most recent codeseparator CScript scriptCode(pbegincodehash, pend); - // Drop the signatures, since there's no way for a signature to sign itself + // Drop the signature in pre-segwit scripts but not segwit scripts for (int k = 0; k < nSigsCount; k++) { valtype& vchSig = stacktop(-isig-k); |