string_replace(): Fix infinite loop if (replace) contains an occurrence of (find...

diff --git a/Src/Common/UnicodeString.cpp b/Src/Common/UnicodeString.cpp
index 3b24f13..df2a52d 100644 (file)
--- a/Src/Common/UnicodeString.cpp
+++ b/Src/Common/UnicodeString.cpp
@@ -57,11 +57,12 @@ String string_makelower(const String &str)
  */
 void string_replace(String &target, const String &find, const String &replace)
 {
-       const std::string::size_type replace_len = find.length();
-       std::string::size_type pos = 0;
+       const String::size_type find_len = find.length();
+       const String::size_type replace_len = replace.length();
+       String::size_type pos = 0;
        while ((pos = target.find(find, pos)) != String::npos)
        {
-               target.replace(pos, replace_len, replace);
+               target.replace(pos, find_len, replace);
                pos += replace_len;
        }
 }