Revision: 6796
Author: [email protected]
Date: Tue Feb 15 07:12:51 2011
Log: Fix issue 1160: check array elements in ArrayJoin.
Review URL: http://codereview.chromium.org/6529020
http://code.google.com/p/v8/source/detail?r=6796
Added:
/branches/bleeding_edge/test/mjsunit/regress/regress-1160.js
Modified:
/branches/bleeding_edge/src/runtime.cc
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/regress/regress-1160.js Tue Feb 15
07:12:51 2011
@@ -0,0 +1,46 @@
+// Copyright 2011 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/v8/issues/detail?id=1160
+
+// Array.prototype.join uses a temporary array internally. Verify it
+// does not crash and throws an illegal argument exception instead
+// when keyed store on the array does not work as expected because of
+// the setter on its prototype.
+
+try {
+ var N = 100;
+ var array = Array(N);
+ for (var i = 0; i < N; ++i) {
+ array[i] = i;
+ }
+ Array.prototype.__defineSetter__(32, function() { });
+ // The next line throws. We should make it work even with changed
+ // prototype. See http://code.google.com/p/v8/issues/detail?id=1161
+ array.join(",");
+ assertUnreachable();
+} catch (e) { }
=======================================
--- /branches/bleeding_edge/src/runtime.cc Tue Feb 15 05:53:30 2011
+++ /branches/bleeding_edge/src/runtime.cc Tue Feb 15 07:12:51 2011
@@ -5849,7 +5849,12 @@
}
int length = (array_length - 1) * separator_length;
for (int i = 0; i < array_length; i++) {
- String* element = String::cast(fixed_array->get(i));
+ Object* element_obj = fixed_array->get(i);
+ if (!element_obj->IsString()) {
+ // TODO(1161): handle this case.
+ return Top::Throw(Heap::illegal_argument_symbol());
+ }
+ String* element = String::cast(element_obj);
int increment = element->length();
if (increment > String::kMaxLength - length) {
Top::context()->mark_out_of_memory();
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
