Commit 8dc9bc96 authored by danno@chromium.org's avatar danno@chromium.org

Don't crash on stack overflow entering the debugger.

R=ager@chromium.org, sgjesse@chromium.org
BUG=chromium:119429
TEST= test/mjsunit/regress/regress-119429.js

Review URL: https://chromiumcodereview.appspot.com/9965101

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11219 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 965fea65
// Copyright 2011 the V8 project authors. All rights reserved. // Copyright 2012 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
// met: // met:
...@@ -767,15 +767,22 @@ bool Debug::CompileDebuggerScript(int index) { ...@@ -767,15 +767,22 @@ bool Debug::CompileDebuggerScript(int index) {
Handle<JSFunction> function = Handle<JSFunction> function =
factory->NewFunctionFromSharedFunctionInfo(function_info, context); factory->NewFunctionFromSharedFunctionInfo(function_info, context);
Execution::TryCall(function, Handle<Object>(context->global()), Handle<Object> exception =
0, NULL, &caught_exception); Execution::TryCall(function, Handle<Object>(context->global()),
0, NULL, &caught_exception);
// Check for caught exceptions. // Check for caught exceptions.
if (caught_exception) { if (caught_exception) {
ASSERT(!isolate->has_pending_exception());
MessageLocation computed_location;
isolate->ComputeLocation(&computed_location);
Handle<Object> message = MessageHandler::MakeMessageObject( Handle<Object> message = MessageHandler::MakeMessageObject(
"error_loading_debugger", NULL, Vector<Handle<Object> >::empty(), "error_loading_debugger", &computed_location,
Handle<String>(), Handle<JSArray>()); Vector<Handle<Object> >::empty(), Handle<String>(), Handle<JSArray>());
ASSERT(!isolate->has_pending_exception());
isolate->set_pending_exception(*exception);
MessageHandler::ReportMessage(Isolate::Current(), NULL, message); MessageHandler::ReportMessage(Isolate::Current(), NULL, message);
isolate->clear_pending_exception();
return false; return false;
} }
...@@ -3232,7 +3239,7 @@ EnterDebugger::~EnterDebugger() { ...@@ -3232,7 +3239,7 @@ EnterDebugger::~EnterDebugger() {
debug->SetBreak(break_frame_id_, break_id_); debug->SetBreak(break_frame_id_, break_id_);
// Check for leaving the debugger. // Check for leaving the debugger.
if (prev_ == NULL) { if (!load_failed_ && prev_ == NULL) {
// Clear mirror cache when leaving the debugger. Skip this if there is a // Clear mirror cache when leaving the debugger. Skip this if there is a
// pending exception as clearing the mirror cache calls back into // pending exception as clearing the mirror cache calls back into
// JavaScript. This can happen if the v8::Debug::Call is used in which // JavaScript. This can happen if the v8::Debug::Call is used in which
......
...@@ -826,6 +826,11 @@ Object* Execution::DebugBreakHelper() { ...@@ -826,6 +826,11 @@ Object* Execution::DebugBreakHelper() {
return isolate->heap()->undefined_value(); return isolate->heap()->undefined_value();
} }
StackLimitCheck check(isolate);
if (check.HasOverflowed()) {
return isolate->heap()->undefined_value();
}
{ {
JavaScriptFrameIterator it(isolate); JavaScriptFrameIterator it(isolate);
ASSERT(!it.done()); ASSERT(!it.done());
...@@ -862,6 +867,11 @@ void Execution::ProcessDebugMessages(bool debug_command_only) { ...@@ -862,6 +867,11 @@ void Execution::ProcessDebugMessages(bool debug_command_only) {
// Clear the debug command request flag. // Clear the debug command request flag.
isolate->stack_guard()->Continue(DEBUGCOMMAND); isolate->stack_guard()->Continue(DEBUGCOMMAND);
StackLimitCheck check(isolate);
if (check.HasOverflowed()) {
return;
}
HandleScope scope(isolate); HandleScope scope(isolate);
// Enter the debugger. Just continue if we fail to enter the debugger. // Enter the debugger. Just continue if we fail to enter the debugger.
EnterDebugger debugger; EnterDebugger debugger;
......
// 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
var d = 0;
function recurse() {
if (++d == 26130) { // A magic number just below stack overflow on ia32
%DebugBreak();
}
recurse();
}
assertThrows(function() { recurse();} );
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment