Revision: 9237
Author: [email protected]
Date: Mon Sep 12 04:36:07 2011
Log: Merge r9213 into the 3.3 branch.
This change fixes crashes caused by trying to change element property
definitions, freeze, seal or preventExtensions on objects with external
elements arrays.
[email protected]
BUG=95920
TEST=test/mjsunit/regress/regress-95920.js
Review URL: http://codereview.chromium.org/7787030
http://code.google.com/p/v8/source/detail?r=9237
Added:
/branches/3.3/test/mjsunit/regress/regress-95920.js
Modified:
/branches/3.3/src/messages.js
/branches/3.3/src/objects.cc
/branches/3.3/src/runtime.cc
/branches/3.3/src/version.cc
=======================================
--- /dev/null
+++ /branches/3.3/test/mjsunit/regress/regress-95920.js Mon Sep 12 04:36:07
2011
@@ -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();
+ })
+})();
=======================================
--- /branches/3.3/src/messages.js Mon Aug 22 06:54:47 2011
+++ /branches/3.3/src/messages.js Mon Sep 12 04:36:07 2011
@@ -241,6 +241,8 @@
strict_cannot_assign: ["Cannot assign to read
only '", "%0", "' in strict mode"],
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."],
+ 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 message_type = %MessageGetType(message);
=======================================
--- /branches/3.3/src/objects.cc Thu Aug 4 05:55:56 2011
+++ /branches/3.3/src/objects.cc Mon Sep 12 04:36:07 2011
@@ -3104,6 +3104,17 @@
ASSERT(proto->IsJSGlobalObject());
return JSObject::cast(proto)->PreventExtensions();
}
+
+ // It's not possible to seal objects with external array elements
+ if (HasExternalArrayElements()) {
+ HandleScope scope(isolate);
+ Handle<Object> object(this);
+ Handle<Object> error =
+ isolate->factory()->NewTypeError(
+ "cant_prevent_ext_external_array_elements",
+ HandleVector(&object, 1));
+ return isolate->Throw(*error);
+ }
// If there are fast elements we normalize.
if (HasFastElements()) {
=======================================
--- /branches/3.3/src/runtime.cc Thu Aug 4 05:55:56 2011
+++ /branches/3.3/src/runtime.cc Mon Sep 12 04:36:07 2011
@@ -3885,6 +3885,17 @@
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);
+ }
+
NormalizeElements(js_object);
Handle<NumberDictionary> dictionary(js_object->element_dictionary());
// Make sure that we never go back to fast case.
=======================================
--- /branches/3.3/src/version.cc Tue Sep 6 06:51:12 2011
+++ /branches/3.3/src/version.cc Mon Sep 12 04:36:07 2011
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 3
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 36
+#define PATCH_LEVEL 37
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
