From d3733ce1e373e4632dce43540949331b588c7739 Mon Sep 17 00:00:00 2001 From: "yangguo@chromium.org" Date: Tue, 14 Aug 2012 10:06:34 +0000 Subject: [PATCH] Prevent segfault on undefined inline runtime call. R=mstarzinger@chromium.org BUG=v8:2286 Review URL: https://chromiumcodereview.appspot.com/10828282 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12306 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/parser.cc | 7 +++++++ test/mjsunit/regress-2286.js | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 test/mjsunit/regress-2286.js diff --git a/src/parser.cc b/src/parser.cc index b1e2a7c78a..a22395e9ac 100644 --- a/src/parser.cc +++ b/src/parser.cc @@ -4804,6 +4804,13 @@ Expression* Parser::ParseV8Intrinsic(bool* ok) { return NULL; } + // Check that the function is defined if it's an inline runtime call. + if (function == NULL && name->Get(0) == '_') { + ReportMessage("not_defined", Vector >(&name, 1)); + *ok = false; + return NULL; + } + // We have a valid intrinsics call or a call to a builtin. return factory()->NewCallRuntime(name, function, args); } diff --git a/test/mjsunit/regress-2286.js b/test/mjsunit/regress-2286.js new file mode 100644 index 0000000000..372451ec44 --- /dev/null +++ b/test/mjsunit/regress-2286.js @@ -0,0 +1,32 @@ +// Copyright 2012 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: --allow-natives-syntax + +assertThrows("f()", ReferenceError); +assertThrows("%f()", TypeError); +assertThrows("%_f()", SyntaxError);