diff options
| author | Pieter Wuille <pieter@wuille.net> | 2021-03-01 18:10:13 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter@wuille.net> | 2021-03-15 17:29:39 -0700 |
| commit | 497718b467330b2c6bb0d44786020c55f1aa75f9 (patch) | |
| tree | e69fdfc0e4302474c62be3873f6b56c07cdf9961 /src/script/interpreter.cpp | |
| parent | 3820090bd619ac85ab35eff376c03136fe4a9f04 (diff) | |
| download | bitcoin-497718b467330b2c6bb0d44786020c55f1aa75f9.tar.xz | |
Treat amount<0 also as missing data for P2WPKH/P2WSH
Historically lack of amount data has been treated as amount==-1. Change
this and treat it as missing data, as introduced in the previous commits.
To be minimally invasive, do this at SignatureHash() call sites rather
than inside SignatureHash() (which currently has no means or returning
a failure code).
Diffstat (limited to 'src/script/interpreter.cpp')
| -rw-r--r-- | src/script/interpreter.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 2b10f5b0df..abc0625bb1 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1681,6 +1681,9 @@ bool GenericTransactionSignatureChecker<T>::CheckECDSASignature(const std::vecto int nHashType = vchSig.back(); vchSig.pop_back(); + // Witness sighashes need the amount. + if (sigversion == SigVersion::WITNESS_V0 && amount < 0) return HandleMissingData(m_mdb); + uint256 sighash = SignatureHash(scriptCode, *txTo, nIn, nHashType, amount, sigversion, this->txdata); if (!VerifyECDSASignature(vchSig, pubkey, sighash)) |