From 6c0cde67bc8a7a5c50db437a83866b9bbcb21322 Mon Sep 17 00:00:00 2001 From: "lrn@chromium.org" Date: Thu, 14 Oct 2010 08:51:20 +0000 Subject: [PATCH] Fix bug in cache handling of lastIndex on global regexps. Review URL: http://codereview.chromium.org/3745005 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5615 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/regexp.js | 4 ++-- test/mjsunit/regress/regress-58740.js | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 test/mjsunit/regress/regress-58740.js diff --git a/src/regexp.js b/src/regexp.js index faa525d..59c4040 100644 --- a/src/regexp.js +++ b/src/regexp.js @@ -186,10 +186,10 @@ function RegExpExec(string) { %_IsRegExpEquivalent(cache.regExp, this) && %_ObjectEquals(cache.subject, string)) { if (cache.answerSaved) { - // If this regexp is not global, cache.lastIndex is zero, so we only get + // If this regexp is global, cache.lastIndex is zero, so we only get // here if this.lastIndex is zero, and resulting this.lastIndex // must be zero too, so no change is necessary. - if (this.global) this.lastIndex = lastMatchInfo[CAPTURE1]; + if (!this.global) this.lastIndex = lastMatchInfo[CAPTURE1]; return %_RegExpCloneResult(cache.answer); } else { saveAnswer = true; diff --git a/test/mjsunit/regress/regress-58740.js b/test/mjsunit/regress/regress-58740.js new file mode 100644 index 0000000..ab3e93b --- /dev/null +++ b/test/mjsunit/regress/regress-58740.js @@ -0,0 +1,35 @@ +// 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. + +// See: http://code.google.com/p/chromium/issues/detail?id=58740 + +var re = /.+/g; +re.exec(""); +re.exec("anystring"); +re=/.+/g; +re.exec(""); +assertEquals(0, re.lastIndex); -- 2.7.4