From: yangguo@chromium.org Date: Wed, 12 Sep 2012 15:26:43 +0000 (+0000) Subject: Correctly initialize regexp global cache. X-Git-Tag: upstream/4.7.83~16021 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67d050662223a17992e638c5bd605a0e05a71818;p=platform%2Fupstream%2Fv8.git Correctly initialize regexp global cache. R=ulan@chromium.org BUG=148378 Review URL: https://chromiumcodereview.appspot.com/10905239 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12491 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/jsregexp.cc b/src/jsregexp.cc index ae25432..e59170d 100644 --- a/src/jsregexp.cc +++ b/src/jsregexp.cc @@ -706,16 +706,17 @@ Handle RegExpImpl::SetLastMatchInfo(Handle last_match_info, RegExpImpl::GlobalCache::GlobalCache(Handle regexp, Handle subject, bool is_global, - Isolate* isolate) { + Isolate* isolate) + : register_array_(NULL), + register_array_size_(0), + regexp_(regexp), + subject_(subject) { #ifdef V8_INTERPRETED_REGEXP bool interpreted = true; #else bool interpreted = false; #endif // V8_INTERPRETED_REGEXP - regexp_ = regexp; - subject_ = subject; - if (regexp_->TypeTag() == JSRegExp::ATOM) { static const int kAtomRegistersPerMatch = 2; registers_per_match_ = kAtomRegistersPerMatch; diff --git a/test/mjsunit/regress/regress-148378.js b/test/mjsunit/regress/regress-148378.js new file mode 100644 index 0000000..d37cea1 --- /dev/null +++ b/test/mjsunit/regress/regress-148378.js @@ -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. + +"a".replace(/a/g, function() { return "c"; }); + +function test() { + try { + test(); + } catch(e) { + "b".replace(/(b)/g, function() { return "c"; }); + } +} + +test();