From e3d788329ac1b4eba7e145b0df05ac1c5b71654d Mon Sep 17 00:00:00 2001 From: "peterhal@chromium.org" Date: Wed, 6 Apr 2011 16:22:06 +0000 Subject: [PATCH] 1309 fix BUG= TEST= Review URL: http://codereview.chromium.org/6800018 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7517 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/messages.js | 1 + src/objects.cc | 16 ++++++++++++++++ test/mjsunit/regress/regress-1309.js | 30 ++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 test/mjsunit/regress/regress-1309.js diff --git a/src/messages.js b/src/messages.js index 3eb056f..e657fc0 100644 --- a/src/messages.js +++ b/src/messages.js @@ -190,6 +190,7 @@ function FormatMessage(message) { property_desc_object: ["Property description must be an object: ", "%0"], redefine_disallowed: ["Cannot redefine property: ", "%0"], define_disallowed: ["Cannot define property, object is not extensible: ", "%0"], + non_extensible_proto: ["%0", " is not extensible"], // RangeError invalid_array_length: ["Invalid array length"], stack_overflow: ["Maximum call stack size exceeded"], diff --git a/src/objects.cc b/src/objects.cc index 9a5357a..47ba64d 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -6866,6 +6866,22 @@ MaybeObject* JSObject::SetPrototype(Object* value, // SpiderMonkey behaves this way. if (!value->IsJSObject() && !value->IsNull()) return value; + // From 8.6.2 Object Internal Methods + // ... + // In addition, if [[Extensible]] is false the value of the [[Class]] and + // [[Prototype]] internal properties of the object may not be modified. + // ... + // Implementation specific extensions that modify [[Class]], [[Prototype]] + // or [[Extensible]] must not violate the invariants defined in the preceding + // paragraph. + if (!this->map()->is_extensible()) { + HandleScope scope; + Handle handle(this, heap->isolate()); + return heap->isolate()->Throw( + *FACTORY->NewTypeError("non_extensible_proto", + HandleVector(&handle, 1))); + } + // Before we can set the prototype we need to be sure // prototype cycles are prevented. // It is sufficient to validate that the receiver is not in the new prototype diff --git a/test/mjsunit/regress/regress-1309.js b/test/mjsunit/regress/regress-1309.js new file mode 100644 index 0000000..122e591 --- /dev/null +++ b/test/mjsunit/regress/regress-1309.js @@ -0,0 +1,30 @@ +// 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. + + +var o = Object.preventExtensions({}); +assertThrows("o.__proto__ = {}"); -- 2.7.4