Revision: 4511
Author: [email protected]
Date: Tue Apr 27 04:45:08 2010
Log: Fix search-for-string and replace global to avoid hangs
and spurious exceptions.
Review URL: http://codereview.chromium.org/1687013
http://code.google.com/p/v8/source/detail?r=4511
Added:
/branches/bleeding_edge/test/mjsunit/search-string-multiple.js
Modified:
/branches/bleeding_edge/src/runtime.cc
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/search-string-multiple.js Tue Apr
27 04:45:08 2010
@@ -0,0 +1,62 @@
+// Copyright 2010 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Test search and replace where we search for a string, not a regexp.
+
+function TestCase(id, expected_output, regexp_source, flags, input) {
+ print(id);
+ var re = new RegExp(regexp_source, flags);
+ var output = input.replace(re, MakeReplaceString);
+ assertEquals(expected_output, output, id);
+}
+
+
+function MakeReplaceString() {
+ // Arg 0 is the match, n captures follow, n + 1 is offset of match, n +
2 is
+ // the subject.
+ var l = arguments.length;
+ var a = new Array(l - 3);
+ a.push(arguments[0]);
+ for (var i = 2; i < l - 2; i++) {
+ a.push(arguments[i]);
+ }
+ return "[@" + arguments[l - 2] + ":" + a.join(",") + "]";
+}
+
+
+(function () {
+ TestCase(1,
+ "ajaxNiceForm.villesHome([...@24:#OBJ#])",
+ "#OBJ#",
+ "g",
+ "ajaxNiceForm.villesHome(#OBJ#)");
+ TestCase(2,
+ "A long string with no non-ASCII characters",
+ "Unicode string \u1234",
+ "g",
+ "A long string with no non-ASCII characters");
+})();
=======================================
--- /branches/bleeding_edge/src/runtime.cc Wed Apr 21 09:59:58 2010
+++ /branches/bleeding_edge/src/runtime.cc Tue Apr 27 04:45:08 2010
@@ -3162,7 +3162,7 @@
StringSearchStrategy strategy =
InitializeStringSearch(pattern_string, is_ascii);
switch (strategy) {
- case SEARCH_FAIL: return false;
+ case SEARCH_FAIL: break;
case SEARCH_SHORT:
while (pos <= max_search_start) {
if (!builder->HasCapacity(kMaxBuilderEntriesPerRegExpMatch)) {
@@ -3189,16 +3189,17 @@
case SEARCH_LONG:
while (pos <= max_search_start) {
if (!builder->HasCapacity(kMaxBuilderEntriesPerRegExpMatch)) {
- *match_pos = pos;
- return false;
- }
- int new_pos = ComplexIndexOf(subject,
- pattern_string,
- pos + pattern_length);
+ *match_pos = pos;
+ return false;
+ }
+ int match_end = pos + pattern_length;
+ int new_pos = ComplexIndexOf(subject, pattern_string, match_end);
if (new_pos >= 0) {
- // A match has been found.
- if (new_pos > pos) {
- ReplacementStringBuilder::AddSubjectSlice(builder, pos,
new_pos);
+ // A match has been found.
+ if (new_pos > match_end) {
+ ReplacementStringBuilder::AddSubjectSlice(builder,
+ match_end,
+ new_pos);
}
pos = new_pos;
builder->Add(pattern);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
