Do not allow calls to SetProtoType on functions that should not have a prototype (fixes issue 1151)
Review URL: http://codereview.chromium.org/6518003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@6765 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
ab3cd77667
commit
6d9fde492c
@ -447,6 +447,7 @@ MaybeObject* Accessors::FunctionGetPrototype(Object* object, void*) {
|
|||||||
JSFunction* function = FindInPrototypeChain<JSFunction>(object, &found_it);
|
JSFunction* function = FindInPrototypeChain<JSFunction>(object, &found_it);
|
||||||
if (!found_it) return Heap::undefined_value();
|
if (!found_it) return Heap::undefined_value();
|
||||||
if (!function->has_prototype()) {
|
if (!function->has_prototype()) {
|
||||||
|
if (!function->should_have_prototype()) return Heap::undefined_value();
|
||||||
Object* prototype;
|
Object* prototype;
|
||||||
{ MaybeObject* maybe_prototype = Heap::AllocateFunctionPrototype(function);
|
{ MaybeObject* maybe_prototype = Heap::AllocateFunctionPrototype(function);
|
||||||
if (!maybe_prototype->ToObject(&prototype)) return maybe_prototype;
|
if (!maybe_prototype->ToObject(&prototype)) return maybe_prototype;
|
||||||
|
32
test/mjsunit/regress/regress-1151.js
Normal file
32
test/mjsunit/regress/regress-1151.js
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
// Test that we do not try to create prototypes on objects that has the,
|
||||||
|
// should_have_prototype flag set to false.
|
||||||
|
|
||||||
|
__defineSetter__.__proto__ = function() {};
|
||||||
|
__defineSetter__['prototype']
|
Loading…
Reference in New Issue
Block a user