[script] Return early if no valid opcodes found in CountWitnessSigOps(...) #10975

pull practicalswift wants to merge 1 commits into bitcoin:master from practicalswift:return-early-in-CountWitnessSigOps changing 1 files +7 −1

practicalswift commented at 8:06 AM on August 2, 2017: contributor

Return early if no valid opcodes found in CountWitnessSigOps(...).

Prior to this commit this was the only place in the codebase where GetOp(...) was called without checking the return value.

[script] Return early if no valid opcodes found in CountWitnessSigOps(...)

Prior to this commit this was the only place in the codebase where
GetOp(...) was called without checking the return value.

11d50a416f

jonasschnelli added the label Refactoring on Aug 3, 2017

in src/script/interpreter.cpp:1568 in 11d50a416f

1564 | +            if (scriptSig.GetOp(pc, opcode, data)) {
1565 | +                hasValidOp = true;
1566 | +            }
1567 | +        }
1568 | +        if (!hasValidOp) {
1569 | +            return 0;

promag commented at 3:36 PM on August 6, 2017:

This is not an obvious early return, because one has to go deeper in IsWitnessProgram.

promag commented at 3:37 PM on August 6, 2017: member

Concept ACK.
promag commented at 3:39 PM on August 6, 2017: member

Nit, reword to use your usual prefix script:.
practicalswift renamed this:
~~[script] Return early if no valid opcodes found in CountWitnessSigOps(...)~~
script: Return early if no valid opcodes found in CountWitnessSigOps(...)
on Aug 6, 2017
practicalswift renamed this:
~~script: Return early if no valid opcodes found in CountWitnessSigOps(...)~~
[script] Return early if no valid opcodes found in CountWitnessSigOps(...)
on Aug 23, 2017
practicalswift closed this on Jan 31, 2018
practicalswift deleted the branch on Apr 10, 2021
DrahtBot locked this on Aug 16, 2022

Contributors

practicalswift

promag

Labels

Refactoring