Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 23:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated the StringUtil::replace function to avoid potential endless loops.

Browse source
This commit is contained in:
Leon Styhre 2022-02-21 17:14:51 +01:00
parent 171c25917c
commit fabc18a680
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
es-core/src/utils/StringUtil.cpp
View file

@ -583,17 +583,20 @@ namespace Utils
} }
std::string replace(const std::string& stringArg, std::string replace(const std::string& stringArg,
const std::string& replace, const std::string& from,
const std::string& with) const std::string& to)
{ {
std::string stringReplace = stringArg; std::string replaced;
size_t pos; size_t lastPos {0};
size_t findPos {0};
while ((pos = stringReplace.find(replace)) != std::string::npos) while ((findPos = stringArg.find(from, lastPos)) != std::string::npos) {
stringReplace = replaced.append(stringArg, lastPos, findPos - lastPos).append(to);
stringReplace.replace(pos, replace.length(), with.c_str(), with.length()); lastPos = findPos + from.length();
}
return stringReplace; replaced.append(stringArg.substr(lastPos));
return replaced;
} }
std::wstring stringToWideString(const std::string& stringArg) std::wstring stringToWideString(const std::string& stringArg)