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

Fixed an issue where the StringUtil::replace function did not remove repeating occurances.

Browse source
This commit is contained in:
Leon Styhre 2022-04-15 20:33:53 +02:00
parent 2001a9f639
commit 03e457516a
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -586,17 +586,28 @@ namespace Utils
const std::string& from,
const std::string& to)
{
std::string replaced;
size_t lastPos {0};
size_t findPos {0};
std::string result {stringArg};
while ((findPos = stringArg.find(from, lastPos)) != std::string::npos) {
replaced.append(stringArg, lastPos, findPos - lastPos).append(to);
lastPos = findPos + from.length();
// The outer loop makes sure that we're eliminating all repeating occurances
// of the 'from' value.
while (result.find(from) != std::string::npos) {
// Prevent endless loops.
if (from == to)
break;
std::string replaced;
size_t lastPos {0};
size_t findPos {0};
while ((findPos = result.find(from, lastPos)) != std::string::npos) {
replaced.append(result, lastPos, findPos - lastPos).append(to);
lastPos = findPos + from.length();
}
replaced.append(result.substr(lastPos));
result = replaced;
}
replaced.append(stringArg.substr(lastPos));
return replaced;
return result;
}
std::wstring stringToWideString(const std::string& stringArg)