Merge b8740d6737 into merged_master (Bitcoin PR #18468)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:07 +00:00
commit 2468108f7b
6 changed files with 104 additions and 44 deletions

View file

@ -1925,7 +1925,7 @@ static bool ExecuteWitnessScript(const Span<const valtype>& stack_span, const CS
static bool VerifyWitnessProgram(const CScriptWitness& witness, int witversion, const std::vector<unsigned char>& program, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* serror)
{
CScript scriptPubKey;
Span<const valtype> stack = MakeSpan(witness.stack);
Span<const valtype> stack{witness.stack};
if (witversion == 0) {
if (program.size() == WITNESS_V0_SCRIPTHASH_SIZE) {