Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix potential endless loop in util::strreplace

Browse source
This commit is contained in:
Tim Wojtulewicz 2024-09-11 11:21:25 +02:00
parent ede4e661cd
commit 6b11252b8f
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"; string s = "this is not a string";
CHECK(strreplace(s, "not", "really") == "this is really a string"); CHECK(strreplace(s, "not", "really") == "this is really a string");
CHECK(strreplace(s, "not ", "") == "this is 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 strreplace(const string& s, const string& o, const string& n) {
string r = s; string r = s;
size_t i = 0;
while ( true ) { while ( true ) {
size_t i = r.find(o); i = r.find(o, i);
if ( i == std::string::npos ) if ( i == std::string::npos )
break; break;
r.replace(i, o.size(), n); r.replace(i, o.size(), n);
i += n.size();
} }
return r; return r;