From df860eda5ca03ff4ee3c034b3e064d463c5567b3 Mon Sep 17 00:00:00 2001 From: "danno@chromium.org" Date: Fri, 9 Sep 2011 14:30:00 +0000 Subject: [PATCH] Don't allow seal or element property re-definition on external arrays. R=ricow@chromium.org BUG=95920 TEST=test/mjsunit/regress/regress-95920.js Review URL: http://codereview.chromium.org/7858031 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9213 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/messages.js | 2 ++ src/objects.cc | 11 +++++++ src/runtime.cc | 11 +++++++ test/mjsunit/regress/regress-95920.js | 58 +++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 test/mjsunit/regress/regress-95920.js diff --git a/src/messages.js b/src/messages.js index 3c85d94..4adcb30 100644 --- a/src/messages.js +++ b/src/messages.js @@ -239,6 +239,8 @@ function FormatMessage(message) { "strict_poison_pill", ["'caller', 'callee', and 'arguments' properties may not be accessed on strict mode functions or the arguments objects for calls to them"], "strict_caller", ["Illegal access to a strict mode caller function."], "unprotected_let", ["Illegal let declaration in unprotected statement context."], + "cant_prevent_ext_external_array_elements", ["Cannot prevent extension of an object with external array elements"], + "redef_external_array_element", ["Cannot redefine a property of an object with external array elements"], ]; var messages = { __proto__ : null }; var desc = new PropertyDescriptor(); diff --git a/src/objects.cc b/src/objects.cc index db65d5b..c77a432 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -3414,6 +3414,17 @@ MaybeObject* JSObject::PreventExtensions() { return JSObject::cast(proto)->PreventExtensions(); } + // It's not possible to seal objects with external array elements + if (HasExternalArrayElements()) { + HandleScope scope(isolate); + Handle object(this); + Handle error = + isolate->factory()->NewTypeError( + "cant_prevent_ext_external_array_elements", + HandleVector(&object, 1)); + return isolate->Throw(*error); + } + // If there are fast elements we normalize. NumberDictionary* dictionary = NULL; { MaybeObject* maybe = NormalizeElements(); diff --git a/src/runtime.cc b/src/runtime.cc index 44ab519..abc71b3 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -4293,6 +4293,17 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_DefineOrRedefineDataProperty) { if (proto->IsNull()) return *obj_value; js_object = Handle::cast(proto); } + + // Don't allow element properties to be redefined on objects with external + // array elements. + if (js_object->HasExternalArrayElements()) { + Handle args[2] = { js_object, name }; + Handle error = + isolate->factory()->NewTypeError("redef_external_array_element", + HandleVector(args, 2)); + return isolate->Throw(*error); + } + Handle dictionary = NormalizeElements(js_object); // Make sure that we never go back to fast case. dictionary->set_requires_slow_elements(); diff --git a/test/mjsunit/regress/regress-95920.js b/test/mjsunit/regress/regress-95920.js new file mode 100644 index 0000000..20e73fb --- /dev/null +++ b/test/mjsunit/regress/regress-95920.js @@ -0,0 +1,58 @@ +// 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. + +// Tests that objects with external arrays cannot be sealed or have their +// properties redefined. + +(function() { + assertThrows(function() { + [0].every(function(){ Object.seal((new Int8Array(42))); }); + assertUnreable(); + }, TypeError) +})(); + +(function() { + assertThrows(function() { + [0].every(function(){ Object.freeze((new Int8Array(42))); }); + assertUnreable(); + }, TypeError) +})(); + +(function() { + assertThrows(function() { + [0].every(function(){ Object.preventExtensions((new Int8Array(42))); }); + assertUnreable(); + }, TypeError) +})(); + +(function() { + assertThrows(function() { + Object.defineProperty(new Int8Array(42), "1", + { writable: false, value: "1" }); + assertUnreable(); + }) +})(); -- 2.7.4