highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-19 14:53:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8927: Add script tests for FindAndDelete in pre-segwit and segwit scripts

Browse Source 
acf853d Add script tests for FindAndDelete in pre-segwit and segwit scripts (Johnson Lau)
This commit is contained in:
Wladimir J. van der Laan
2016-10-19 17:15:36 +02:00
parent 3e942a7060 acf853df91
commit 475d68252e
3 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/interpreter.cpp
View File

@@ -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);