Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 05:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/strreplace-endless-loop'

Browse source 
* origin/topic/timw/strreplace-endless-loop:
  Fix potential endless loop in util::strreplace
This commit is contained in:
Tim Wojtulewicz 2024-09-12 08:59:20 +02:00
commit 923ca7e817
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/util.cc
View file

@ -1540,18 +1540,22 @@ TEST_CASE("util strreplace") {
string s = "this is not a string";
CHECK(strreplace(s, "not", "really") == "this is really a string");
CHECK(strreplace(s, "not ", "") == "this is a string");
CHECK(strreplace("\"abc\"", "\"", "\\\"") == "\\\"abc\\\"");
CHECK(strreplace("\\\"abc\\\"", "\\\"", "\"") == "\"abc\"");
}
string strreplace(const string& s, const string& o, const string& n) {
string r = s;
size_t i = 0;
while ( true ) {
size_t i = r.find(o);
i = r.find(o, i);
if ( i == std::string::npos )
break;
r.replace(i, o.size(), n);
i += n.size();
}
return r;