Revision: 12300
Author: [email protected]
Date: Mon Aug 13 08:26:46 2012
Log: Fix wrong indexing in global regexp.
[email protected]
BUG=142087
Review URL: https://chromiumcodereview.appspot.com/10824278
http://code.google.com/p/v8/source/detail?r=12300
Added:
/branches/bleeding_edge/test/mjsunit/regress/regress-crbug-142087.js
Modified:
/branches/bleeding_edge/src/jsregexp.cc
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/regress/regress-crbug-142087.js
Mon Aug 13 08:26:46 2012
@@ -0,0 +1,38 @@
+// Copyright 2012 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.
+
+var string = "What are you looking for?";
+
+var expected_match = [];
+for (var i = 0; i < string.length; i++) {
+ expected_match.push("");
+}
+
+string.replace(/(_)|(_|)/g, "");
+assertArrayEquals(expected_match, string.match(/(_)|(_|)/g, ""));
+
+'***************************************'.match(/((\\)|(\*)|(\$))/g, ".");
=======================================
--- /branches/bleeding_edge/src/jsregexp.cc Mon Aug 6 02:06:27 2012
+++ /branches/bleeding_edge/src/jsregexp.cc Mon Aug 13 08:26:46 2012
@@ -753,7 +753,7 @@
ASSERT(registers_per_match_ >= 2); // Each match has at least one
capture.
ASSERT_GE(register_array_size_, registers_per_match_);
int32_t* last_match =
- ®ister_array_[register_array_size_ - registers_per_match_];
+ ®ister_array_[(current_match_index_ - 1) * registers_per_match_];
last_match[0] = -1;
last_match[1] = 0;
}
@@ -779,7 +779,7 @@
}
int32_t* last_match =
- ®ister_array_[register_array_size_ - registers_per_match_];
+ ®ister_array_[(current_match_index_ - 1) *
registers_per_match_];
int last_end_index = last_match[1];
if (regexp_->TypeTag() == JSRegExp::ATOM) {
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
