citra/citra-nightly
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-nightly.git synced 2024-12-25 01:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #101 from lioncash/inf-loop

Browse source 
Common: Fix a potential infinite loop in StringUtil's ReplaceAll
This commit is contained in:
bunnei 2014-09-09 20:53:33 -04:00
parent 7f201a9821 2f6ef914db
commit 8891c27425
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/string_util.cpp
View file

@ -283,12 +283,17 @@ std::string TabsToSpaces(int tab_size, const std::string &in)
std::string ReplaceAll(std::string result, const std::string& src, const std::string& dest) std::string ReplaceAll(std::string result, const std::string& src, const std::string& dest)
{ {
while(1) size_t pos = 0;
if (src == dest)
return result;
while ((pos = result.find(src, pos)) != std::string::npos)
{ {
size_t pos = result.find(src);
if (pos == std::string::npos) break;
result.replace(pos, src.size(), dest); result.replace(pos, src.size(), dest);
pos += dest.length();
} }
return result; return result;
} }