From: ager@chromium.org Date: Wed, 18 Nov 2009 18:48:04 +0000 (+0000) Subject: Fix crash in string replace with regexp. If the suffix of the subject X-Git-Tag: upstream/4.7.83~22917 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3cf9ce4736ca084ddbeea4ef1c88c05a2867c93d;p=platform%2Fupstream%2Fv8.git Fix crash in string replace with regexp. If the suffix of the subject string is larger than 2047 chars we will encode the slice as two Smis instead of one. The calculation of the max size of the string builder did not take this into account. BUG=http://code.google.com/p/v8/issues/detail?id=515 Review URL: http://codereview.chromium.org/402056 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3334 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/runtime.cc b/src/runtime.cc index ccb8885..13f6561 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -1750,10 +1750,10 @@ static Object* StringReplaceRegExpWithString(String* subject, // Index of end of last match. int prev = 0; - // Number of parts added by compiled replacement plus preceeding string - // and possibly suffix after last match. It is possible for compiled - // replacements to use two elements when encoded as two smis. - const int parts_added_per_loop = compiled_replacement.parts() * 2 + 2; + // Number of parts added by compiled replacement plus preceeding + // string and possibly suffix after last match. It is possible for + // all components to use two elements when encoded as two smis. + const int parts_added_per_loop = 2 * (compiled_replacement.parts() + 2); bool matched = true; do { ASSERT(last_match_info_handle->HasFastElements()); diff --git a/test/mjsunit/regress/regress-515.js b/test/mjsunit/regress/regress-515.js new file mode 100644 index 0000000..7675fe1 --- /dev/null +++ b/test/mjsunit/regress/regress-515.js @@ -0,0 +1,40 @@ +// Copyright 2009 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. + +// Regression test for http://code.google.com/p/v8/issues/detail?id=515. +// +// The test passes if it does not crash. + +var length = 2048; +var s = ""; +for (var i = 0; i < 2048; i++) { + s += '.'; +} + +var string = s + 'x' + s + 'x' + s; + +string.replace(/x/g, "")