From d9437722da7d2f61f3eeda699b2636577ce4beaf Mon Sep 17 00:00:00 2001 From: "danno@chromium.org" Date: Tue, 3 Apr 2012 08:13:59 +0000 Subject: [PATCH] Properly support shrinking arrays in CopyDictionaryToObjectElements. R=mstarzinger@chromium.org BUG=chromium:121407 TEST=test/mjsunit/regress/regress-121407.js Review URL: https://chromiumcodereview.appspot.com/9968056 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11214 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/elements.cc | 10 +++++++-- test/mjsunit/regress/regress-121407.js | 40 ++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 test/mjsunit/regress/regress-121407.js diff --git a/src/elements.cc b/src/elements.cc index 0fc3c53..26d3dc1 100644 --- a/src/elements.cc +++ b/src/elements.cc @@ -199,10 +199,13 @@ static void CopyDictionaryToObjectElements(SeededNumberDictionary* from, } #endif } - ASSERT((copy_size + static_cast(to_start)) <= to->length()); ASSERT(to != from); ASSERT(to_kind == FAST_ELEMENTS || to_kind == FAST_SMI_ONLY_ELEMENTS); if (copy_size == 0) return; + uint32_t to_length = to->length(); + if (to_start + copy_size > to_length) { + copy_size = to_length - to_start; + } for (int i = 0; i < copy_size; i++) { int entry = from->FindEntry(i + from_start); if (entry != SeededNumberDictionary::kNotFound) { @@ -356,8 +359,11 @@ static void CopyDictionaryToDoubleElements(SeededNumberDictionary* from, } } } - ASSERT(copy_size + static_cast(to_start) <= to->length()); if (copy_size == 0) return; + uint32_t to_length = to->length(); + if (to_start + copy_size > to_length) { + copy_size = to_length - to_start; + } for (int i = 0; i < copy_size; i++) { int entry = from->FindEntry(i + from_start); if (entry != SeededNumberDictionary::kNotFound) { diff --git a/test/mjsunit/regress/regress-121407.js b/test/mjsunit/regress/regress-121407.js new file mode 100644 index 0000000..25033fb --- /dev/null +++ b/test/mjsunit/regress/regress-121407.js @@ -0,0 +1,40 @@ +// 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 a = [0,1,2,3]; +a[2000000] = 2000000; +a.length=2000; +for (var i = 0; i <= 256; i++) { + a[i] = new Object(); +} + +a = [0.5,1.5,2.5,3.5,4.5,5.5]; +a[2000000] = 2000000; +a.length=2000; +for (var i = 0; i <= 256; i++) { + a[i] = new Object(); +} \ No newline at end of file -- 2.7.4