diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-08-26 16:49:41 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-08-26 16:50:17 +0200 |
| commit | 727298cef34005c523117adbb2249c8df2c7f89d (patch) | |
| tree | 2394c438b350e12433256cff803e1b3654cdf7c0 /src/script.cpp | |
| parent | 790911ff0a659becd983afd5309b2c16401ba28d (diff) | |
| parent | aa41ac216eb51d61512b4cadc95c809e094215ce (diff) | |
Merge pull request #4763
aa41ac2 Test IsPushOnly() with invalid push (Peter Todd)
Diffstat (limited to 'src/script.cpp')
| -rw-r--r-- | src/script.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script.cpp b/src/script.cpp index 942e8810db..d6d6684f44 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1874,9 +1874,11 @@ bool CScript::IsPushOnly() const const_iterator pc = begin(); while (pc < end()) { + // Note how a script with an invalid PUSHDATA returns False. opcodetype opcode; if (!GetOp(pc, opcode)) return false; + // Note that IsPushOnly() *does* consider OP_RESERVED to be a // push-type opcode, however execution of OP_RESERVED fails, so // it's not relevant to P2SH as the scriptSig would fail prior to |