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

Timestamp:

Jun 20, 2007, 5:00:12 PM (18 years ago)

Author:

bdash

Message:

2007-06-20 Mark Rowe <​[email protected]>

Reviewed by Mitz.

Fix ​http://bugs.webkit.org/show_bug.cgi?id=14244
Bug 14244: Data corruption when using a replace() callback function with data containing "$"

• kjs/string_object.cpp: (KJS::replace): When 'replacement' is a function, do not replace $n placeholders in its return value. This matches the behaviour described in ECMA 262 3rd Ed section 15.5.4.1, and as implemented in Firefox.

2007-06-20 Mark Rowe <​[email protected]>

Reviewed by Mitz.

Test for ​http://bugs.webkit.org/show_bug.cgi?id=14244
Bug 14244: Data corruption when using a replace() callback function with data containing "$"

• fast/js/resources/string-replace-2.js: Update to test with 'replaceValue' being a function returning strings with "$n" placeholders.
• fast/js/string-replace-2-expected.txt:

File:

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

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -345 +345 @@
       pushSourceRange(sourceRanges, sourceRangeCount, sourceRangeCapacity, UString::Range(lastIndex, matchIndex - lastIndex));
 
+      UString substitutedReplacement;
       if (replacementFunction) {
           int completeMatchStart = ovector[0];
@@ -350 +351 @@
 
           args.append(jsString(matchString));
-          
+
           for (unsigned i = 0; i < reg->subPatterns(); i++) {
               int matchStart = ovector[(i + 1) * 2];
               int matchLen = ovector[(i + 1) * 2 + 1] - matchStart;
-              
+
               args.append(jsString(source.substr(matchStart, matchLen)));
           }
@@ -361 +362 @@
           args.append(jsString(source));
 
-          replacementString = replacementFunction->call(exec, exec->dynamicInterpreter()->globalObject(), 
-                                                        args)->toString(exec);
-      }
-      
-      UString substitutedReplacement = substituteBackreferences(replacementString, source, ovector, reg);
+          substitutedReplacement = replacementFunction->call(exec, exec->dynamicInterpreter()->globalObject(), 
+                                                             args)->toString(exec);
+      } else
+          substitutedReplacement = substituteBackreferences(replacementString, source, ovector, reg);
+
       pushReplacement(replacements, replacementCount, replacementCapacity, substitutedReplacement);