From 2f6ef914dbeb660b50074cadadd52c1f11829637 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 8 Sep 2014 14:48:59 -0400 Subject: Common: Fix a potential infinite loop in StringUtil's ReplaceAll --- src/common/string_util.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index c1f22bda3..e78aed75d 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -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) { - 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); + pos += dest.length(); } + return result; } -- cgit v1.2.3