Fixed (fingers crossed) my commit for #7294

Author: dyemanov

src/common/config/config_file.cpp

@@ -415,48 +415,49 @@ ConfigFile::LineType ConfigFile::parseLine(const char* fileName, const String& i
 
 bool ConfigFile::macroParse(String& value, const char* fileName) const
 {
+	String::size_type pos = 0;
 	String::size_type subFrom;
 
-	while ((subFrom = value.find("$(")) != String::npos)
+	while ((subFrom = value.find("$(", pos)) != String::npos)
 	{
 		String::size_type subTo = value.find(")", subFrom);
-		if (subTo != String::npos)
-		{
-			String macro;
-			String m = value.substr(subFrom + 2, subTo - (subFrom + 2));
-
-			if (!translate(fileName, m, macro))
-			{
-				if (flags & CUSTOM_MACROS)
-					continue;
-
-				return false;
-			}
+		if (subTo == String::npos)
+			return false;
 
-			++subTo;
+		String macro;
+		String m = value.substr(subFrom + 2, subTo - (subFrom + 2));
 
-			// Avoid incorrect slashes in pathnames
-			PathUtils::fixupSeparators(value.begin());
-			PathUtils::fixupSeparators(macro.begin());
+		++subTo;
 
-			if (subFrom > 0 && value[subFrom - 1] == PathUtils::dir_sep &&
-				macro.length() > 0 && macro[0] == PathUtils::dir_sep)
-			{
-				--subFrom;
-			}
-			if (subTo < value.length() && value[subTo] == PathUtils::dir_sep &&
-				macro.length() > 0 && macro[macro.length() - 1] == PathUtils::dir_sep)
+		if (!translate(fileName, m, macro))
+		{
+			if (flags & CUSTOM_MACROS)
 			{
-				++subTo;
+				pos = subTo;
+				continue;
 			}
 
-			// Now perform operation
-			value.replace(subFrom, subTo - subFrom, macro);
+			return false;
 		}
-		else
+
+		// Avoid incorrect slashes in pathnames
+		PathUtils::fixupSeparators(value.begin());
+		PathUtils::fixupSeparators(macro.begin());
+
+		if (subFrom > 0 && value[subFrom - 1] == PathUtils::dir_sep &&
+			macro.length() > 0 && macro[0] == PathUtils::dir_sep)
 		{
-			return false;
+			--subFrom;
 		}
+		if (subTo < value.length() && value[subTo] == PathUtils::dir_sep &&
+			macro.length() > 0 && macro[macro.length() - 1] == PathUtils::dir_sep)
+		{
+			++subTo;
+		}
+
+		// Now perform operation
+		value.replace(subFrom, subTo - subFrom, macro);
+		pos = subFrom + macro.length();
 	}
 
 	return true;