phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-25 18:53:23 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix invalid memory access in CScript::operator+=

Browse source
This commit is contained in:
Anthony Towns 2017-09-11 13:40:31 +10:00
parent ee50c9e487
commit d601f16621
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/script/script.h
View file

@ -420,6 +420,7 @@ public:
CScript& operator+=(const CScript& b) CScript& operator+=(const CScript& b)
{ {
reserve(size() + b.size());
insert(end(), b.begin(), b.end()); insert(end(), b.begin(), b.end());
return *this; return *this;
} }

17
src/test/script_tests.cpp
View file

@ -1451,4 +1451,21 @@ BOOST_AUTO_TEST_CASE(script_HasValidOps)
BOOST_CHECK(!script.HasValidOps()); BOOST_CHECK(!script.HasValidOps());
} }
BOOST_AUTO_TEST_CASE(script_can_append_self)
{
CScript s, d;
s = ScriptFromHex("00");
s += s;
d = ScriptFromHex("0000");
BOOST_CHECK(s == d);
// check doubling a script that's large enough to require reallocation
static const char hex[] = "04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f";
s = CScript() << ParseHex(hex) << OP_CHECKSIG;
d = CScript() << ParseHex(hex) << OP_CHECKSIG << ParseHex(hex) << OP_CHECKSIG;
s += s;
BOOST_CHECK(s == d);
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()