Changeset 65840 in webkit

Timestamp:

Aug 23, 2010 4:12:46 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-23 Michael Saboff <​msaboff@apple.com>

Reviewed by Oliver Hunt.

Fixed case where a single character search string in a string.replace()
did not properly handle back reference replacement. The fix is to
check for a '$' as part of the check to see if we can execute the
single character replace optimization.
​https://bugs.webkit.org/show_bug.cgi?id=44067

• runtime/StringPrototype.cpp: (JSC::stringProtoFuncReplace):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/StringPrototype.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-08-23  Michael Saboff  <msaboff@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Fixed case where a single character search string in a string.replace()
+        did not properly handle back reference replacement.  The fix is to 
+        check for a '$' as part of the check to see if we can execute the
+        single character replace optimization.
+        https://bugs.webkit.org/show_bug.cgi?id=44067
+
+        * runtime/StringPrototype.cpp:
+        (JSC::stringProtoFuncReplace):
+
 2010-08-23  Oliver Hunt  <oliver@apple.com>
 

trunk/JavaScriptCore/runtime/StringPrototype.cpp

@@ -426 +426 @@
 
     UString patternString = pattern.toString(exec);
-    if (patternString.length() == 1 && callType == CallTypeNone)
+    // Special case for single character patterns without back reference replacement
+    if (patternString.length() == 1 && callType == CallTypeNone && replacementString.find('$', 0) == notFound)
         return JSValue::encode(sourceVal->replaceCharacter(exec, patternString[0], replacementString));
-    
+
     const UString& source = sourceVal->value(exec);
     size_t matchPos = source.find(patternString);