From 0961b1a93622959eef8246d55a05ee63e0dededb Mon Sep 17 00:00:00 2001 From: "ager@chromium.org" Date: Fri, 6 May 2011 14:14:16 +0000 Subject: [PATCH] Check that receiver is JSObject on API calls. R=sgjesse@chromium.org BUG=v8:1369 TEST=mjsunit/regress/regress-1369.js Review URL: http://codereview.chromium.org/6931056 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7808 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/builtins.cc | 2 ++ test/cctest/test-api.cc | 17 +++++++++++++++ test/mjsunit/regress/regress-1369.js | 31 ++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 test/mjsunit/regress/regress-1369.js diff --git a/src/builtins.cc b/src/builtins.cc index 377de057a3..f473559638 100644 --- a/src/builtins.cc +++ b/src/builtins.cc @@ -1026,6 +1026,8 @@ static inline Object* TypeCheck(Heap* heap, Object** argv, FunctionTemplateInfo* info) { Object* recv = argv[0]; + // API calls are only supported with JSObject receivers. + if (!recv->IsJSObject()) return heap->null_value(); Object* sig_obj = info->signature(); if (sig_obj->IsUndefined()) return recv; SignatureInfo* sig = SignatureInfo::cast(sig_obj); diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc index f48d5b49ff..ab94085a95 100644 --- a/test/cctest/test-api.cc +++ b/test/cctest/test-api.cc @@ -14391,3 +14391,20 @@ THREADED_TEST(AllowCodeGenFromStrings) { V8::SetAllowCodeGenerationFromStringsCallback(&CodeGenerationDisallowed); CheckCodeGenerationDisallowed(); } + + +static v8::Handle NonObjectThis(const v8::Arguments& args) { + return v8::Undefined(); +} + + +THREADED_TEST(CallAPIFunctionOnNonObject) { + v8::HandleScope scope; + LocalContext context; + Handle templ = v8::FunctionTemplate::New(NonObjectThis); + Handle function = templ->GetFunction(); + context->Global()->Set(v8_str("f"), function); + TryCatch try_catch; + CompileRun("f.call(2)"); + CHECK(try_catch.HasCaught()); +} diff --git a/test/mjsunit/regress/regress-1369.js b/test/mjsunit/regress/regress-1369.js new file mode 100644 index 0000000000..f18e37bf82 --- /dev/null +++ b/test/mjsunit/regress/regress-1369.js @@ -0,0 +1,31 @@ +// 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. + +// Flags: --expose-gc + +assertThrows('gc.call(1)'); +assertThrows('gc.call("asdf")');