Reviewers: Rico,
Message:
PTAL
Description:
Don't allow seal or element property re-definition on external arrays.
[email protected]
BUG=95920
TEST=test/mjsunit/regress/regress-95920.js
Please review this at http://codereview.chromium.org/7858031/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/messages.js
M src/objects.cc
M src/runtime.cc
A test/mjsunit/regress/regress-95920.js
Index: src/messages.js
diff --git a/src/messages.js b/src/messages.js
index
3c85d9416af035f37c302e4e7df5c29fee9c234b..33b997ab3e52027a45721a238c4eefc42a18f61b
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."],
+ "seal_external_array_elements", ["Cannot seal 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();
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index
db65d5befbae7f779c1ef370fb3fa56bea3b7939..9418377c5ad059ee6b0088ab5eb7976670ac3a77
100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -3414,6 +3414,15 @@ MaybeObject* JSObject::PreventExtensions() {
return JSObject::cast(proto)->PreventExtensions();
}
+ // It's not possible to seal objects with external array elements
+ if (HasExternalArrayElements()) {
+ Handle<Object> args[1] = { args[0] };
+ Handle<Object> error =
+ isolate->factory()->NewTypeError("seal_external_array_elements",
+ HandleVector(args, 1));
+ return isolate->Throw(*error);
+ }
+
// If there are fast elements we normalize.
NumberDictionary* dictionary = NULL;
{ MaybeObject* maybe = NormalizeElements();
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
44ab519ce3668c32c443e18ba1af7dec19a95523..abc71b321f904515d9dccf6c9dec54b0b0956575
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<JSObject>::cast(proto);
}
+
+ // Don't allow element properties to be redefined on objects with
external
+ // array elements.
+ if (js_object->HasExternalArrayElements()) {
+ Handle<Object> args[2] = { js_object, name };
+ Handle<Object> error =
+ isolate->factory()->NewTypeError("redef_external_array_element",
+ HandleVector(args, 2));
+ return isolate->Throw(*error);
+ }
+
Handle<NumberDictionary> dictionary = NormalizeElements(js_object);
// Make sure that we never go back to fast case.
dictionary->set_requires_slow_elements();
Index: test/mjsunit/regress/regress-95920.js
diff --git a/test/mjsunit/regress/regress-95920.js
b/test/mjsunit/regress/regress-95920.js
new file mode 100644
index
0000000000000000000000000000000000000000..4fbc0f3b9a356008fe0b8efea16d8c0d77982729
--- /dev/null
+++ b/test/mjsunit/regress/regress-95920.js
@@ -0,0 +1,45 @@
+// 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() {
+ try {
+ [0].every(function(){ Object.seal((new Int8Array(42))); });
+ assertTrue(false); // Should be unreachable
+ } catch (e) {
+ }
+})();
+
+(function() {
+ try {
+ defineProperty(new Int8Array(42), "1", { writable: false, value: "1"
});
+ assertTrue(false); // Should be unreachable
+ } catch (e) {
+ }
+})();
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
