From: yangguo@chromium.org <yangguo@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Mon, 13 Aug 2012 15:53:40 +0000 (+0000)
Subject: Fix indexing bug in regexp, part 2.
X-Git-Tag: upstream/4.7.83~16154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3605fcbe63c22ac61f7aafbe40c73cc0c823cb58;p=platform%2Fupstream%2Fv8.git

Fix indexing bug in regexp, part 2.

The previous fix initialized the start index incorrectly.

BUG=

Review URL: https://chromiumcodereview.appspot.com/10834291

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12302 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---

diff --git a/src/jsregexp.cc b/src/jsregexp.cc
index 0bca6a997..ae25432a5 100644
--- a/src/jsregexp.cc
+++ b/src/jsregexp.cc
@@ -748,12 +748,12 @@ RegExpImpl::GlobalCache::GlobalCache(Handle<JSRegExp> regexp,
 
   // Set state so that fetching the results the first time triggers a call
   // to the compiled regexp.
-  current_match_index_ = max_matches_;
+  current_match_index_ = max_matches_ - 1;
   num_matches_ = max_matches_;
   ASSERT(registers_per_match_ >= 2);  // Each match has at least one capture.
   ASSERT_GE(register_array_size_, registers_per_match_);
   int32_t* last_match =
-      &register_array_[(current_match_index_ - 1) * registers_per_match_];
+      &register_array_[current_match_index_ * registers_per_match_];
   last_match[0] = -1;
   last_match[1] = 0;
 }
diff --git a/test/mjsunit/regress/regress-crbug-142087.js b/test/mjsunit/regress/regress-crbug-142087.js
index 6a1dbf7b8..881ca60fb 100644
--- a/test/mjsunit/regress/regress-crbug-142087.js
+++ b/test/mjsunit/regress/regress-crbug-142087.js
@@ -27,7 +27,7 @@
 
 var string = "What are you looking for?";
 
-var expected_match = [];
+var expected_match = [""];
 for (var i = 0; i < string.length; i++) {
   expected_match.push("");
 }