@@ -95,7 +95,7 @@ RegularExpression& RegularExpression::operator=(const RegularExpression& re)
     return *this;
 }
 
-int RegularExpression::match(StringView str, int startFrom, int* matchLength) const
+int RegularExpression::match(StringView str, unsigned startFrom, int* matchLength) const
 {
     if (!d->m_regExpByteCode)
         return -1;
@@ -174,9 +174,9 @@ void replace(String& string, const RegularExpression& target, StringView replace
         if (index < 0)
             break;
         string = makeStringByReplacing(string, index, matchLength, replacement);
-        index += replacement.length();
         if (!matchLength)
             break; // Avoid infinite loop on 0-length matches, e.g. [a-z]*
+        index += replacement.length();
     }
 }
 
 
@@ -41,7 +41,7 @@ class JS_EXPORT_PRIVATE RegularExpression {
     RegularExpression(const RegularExpression&);
     RegularExpression& operator=(const RegularExpression&);
 
-    int match(StringView, int startFrom = 0, int* matchLength = nullptr) const;
+    int match(StringView, unsigned startFrom = 0, int* matchLength = nullptr) const;
     int searchRev(StringView) const;
 
     int matchedLength() const;
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ RegularExpression& RegularExpression::operator=(const RegularExpression& re)`
`95`	`95`	`return *this;`
`96`	`96`	`}`
`97`	`97`
`98`		`-int RegularExpression::match(StringView str, int startFrom, int* matchLength) const`
	`98`	`+int RegularExpression::match(StringView str, unsigned startFrom, int* matchLength) const`
`99`	`99`	`{`
`100`	`100`	`if (!d->m_regExpByteCode)`
`101`	`101`	`return -1;`
`@@ -174,9 +174,9 @@ void replace(String& string, const RegularExpression& target, StringView replace`
`174`	`174`	`if (index < 0)`
`175`	`175`	`break;`
`176`	`176`	`string = makeStringByReplacing(string, index, matchLength, replacement);`
`177`		`- index += replacement.length();`
`178`	`177`	`if (!matchLength)`
`179`	`178`	`break; // Avoid infinite loop on 0-length matches, e.g. [a-z]*`
	`179`	`+ index += replacement.length();`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`