U4-2635 Skip already-checked part of source input

lctjohn · lctjohn · commit 74dd1f918142 · 2014-04-29T13:33:48.000+02:00
diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
@@ -1191,10 +1191,11 @@ public static string ToSafeFileName(this string text, CultureInfo culture)
         /// <returns>Updated string</returns>
         public static string Replace(this string source, string oldString, string newString, StringComparison stringComparison)
         {
-            int index;
+            // Initialised to zero so it can be used as startIndex on first iteration.
+            int index = 0;
 
-            // Determine if there are any matches left in source.
-            while((index = source.IndexOf(oldString, stringComparison)) >= 0)
+            // Determine if there are any matches left in source, starting from last found match.
+            while((index = source.IndexOf(oldString, index, stringComparison)) >= 0)
             {
                 // Remove the old text.
                 source = source.Remove(index, oldString.Length);

Original file line number	Diff line number	Diff line change
`@@ -1191,10 +1191,11 @@ public static string ToSafeFileName(this string text, CultureInfo culture)`
`1191`	`1191`	`/// <returns>Updated string</returns>`
`1192`	`1192`	`public static string Replace(this string source, string oldString, string newString, StringComparison stringComparison)`
`1193`	`1193`	`{`
`1194`		`- int index;`
	`1194`	`+ // Initialised to zero so it can be used as startIndex on first iteration.`
	`1195`	`+ int index = 0;`
`1195`	`1196`
`1196`		`- // Determine if there are any matches left in source.`
`1197`		`- while((index = source.IndexOf(oldString, stringComparison)) >= 0)`
	`1197`	`+ // Determine if there are any matches left in source, starting from last found match.`
	`1198`	`+ while((index = source.IndexOf(oldString, index, stringComparison)) >= 0)`
`1198`	`1199`	`{`
`1199`	`1200`	`// Remove the old text.`
`1200`	`1201`	`source = source.Remove(index, oldString.Length);`