Changeset 2849 in webkit for trunk/JavaScriptCore/kjs/string_object.cpp

Timestamp:

Nov 24, 2002, 7:02:36 AM (23 years ago)

Author:

mjs

Message:

• fixed 3098356 - Hard hang on movie search at www.movietickets.com

• kjs/string_object.cpp: (StringProtoFuncImp::call): When doing a regexp replacement that results in an empty match, always move on to the next character after doing the replacement. The previous code would hit an infinite loop if an initial empty match was replaced with the empty string.

File:

• trunk/JavaScriptCore/kjs/string_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -299 +299 @@
           break;
         len = mstr.size();
-        // special case of empty match
-        if (len == 0 && lastIndex > 0) {
-          pos = lastIndex + 1;
-          if (pos > u.size())
-            break;
-        }
         UString rstr(u3);
         bool ok;
@@ -326 +320 @@
         u = u.substr(0, pos) + rstr + u.substr(pos + len);
         //fprintf(stderr,"pos=%d,len=%d,lastIndex=%d,u=%s\n",pos,len,lastIndex,u.ascii());
+
+        // special case of empty match
+        if (len == 0) {
+          lastIndex = lastIndex + 1;
+          if (lastIndex > u.size())
+            break;
+        }
       } while (global);