LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #4763

Browse source 
aa41ac2 Test IsPushOnly() with invalid push (Peter Todd)
This commit is contained in:
Pieter Wuille 2014-08-26 16:49:41 +02:00
commit 727298cef3
No known key found for this signature in database
GPG key ID: 8F653255C87992E0
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/script.cpp
View file

@ -1874,9 +1874,11 @@ bool CScript::IsPushOnly() const
const_iterator pc = begin(); const_iterator pc = begin();
while (pc < end()) while (pc < end())
{ {
// Note how a script with an invalid PUSHDATA returns False.
opcodetype opcode; opcodetype opcode;
if (!GetOp(pc, opcode)) if (!GetOp(pc, opcode))
return false; return false;
// Note that IsPushOnly() *does* consider OP_RESERVED to be a // Note that IsPushOnly() *does* consider OP_RESERVED to be a
// push-type opcode, however execution of OP_RESERVED fails, so // push-type opcode, however execution of OP_RESERVED fails, so
// it's not relevant to P2SH as the scriptSig would fail prior to // it's not relevant to P2SH as the scriptSig would fail prior to

11
src/test/script_tests.cpp
View file

@ -394,4 +394,15 @@ BOOST_AUTO_TEST_CASE(script_standard_push)
} }
} }
BOOST_AUTO_TEST_CASE(script_IsPushOnly_on_invalid_scripts)
{
// IsPushOnly returns false when given a script containing only pushes that
// are invalid due to truncation. IsPushOnly() is consensus critical
// because P2SH evaluation uses it, although this specific behavior should
// not be consensus critical as the P2SH evaluation would fail first due to
// the invalid push. Still, it doesn't hurt to test it explicitly.
static const unsigned char direct[] = { 1 };
BOOST_CHECK(!CScript(direct, direct+sizeof(direct)).IsPushOnly());
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()