highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 22:50:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7907: Optimize and Cleanup CScript::FindAndDelete

Browse Source 
d1d7775 Improve worst-case behavior of CScript::FindAndDelete (Patrick Strateman)
e2a30bc Unit test for CScript::FindAndDelete (Gavin Andresen)
c0f660c Replace c-style cast with c++ style static_cast. (Patrick Strateman)
ec9ad5f Replace memcmp with std::equal in CScript::FindAndDelete (Patrick Strateman)
This commit is contained in:
Wladimir J. van der Laan
2016-05-05 19:00:42 +02:00
parent 3b9a0bf41f d1d7775587
commit 006cdf64dc
2 changed files with 129 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/script/script.h
View File

@@ -573,17 +573,26 @@ public:
int nFound = 0;
if (b.empty())
return nFound;
iterator pc = begin();
CScript result;
iterator pc = begin(), pc2 = begin();
opcodetype opcode;
do
{
while (end() - pc >= (long)b.size() && memcmp(&pc[0], &b[0], b.size()) == 0)
result.insert(result.end(), pc2, pc);
while (static_cast<size_t>(end() - pc) >= b.size() && std::equal(b.begin(), b.end(), pc))
{
pc = erase(pc, pc + b.size());
pc = pc + b.size();
++nFound;
}
pc2 = pc;
}
while (GetOp(pc, opcode));
if (nFound > 0) {
result.insert(result.end(), pc2, end());
*this = result;
}
return nFound;
}
int Find(opcodetype op) const