Skip to content

src: refactor uncaught exception handling #28257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
joyeecheung wants to merge 2 commits into from
Closed

src: refactor uncaught exception handling #28257

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28a809
src: refactor uncaught exception handling
joyeecheung Jun 15, 2019
112373e
fixup! src: refactor uncaught exception handling
joyeecheung Jun 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! src: refactor uncaught exception handling
  • Loading branch information
@joyeecheung
joyeecheung committed Jun 17, 2019
commit 112373e38ac10ac99ef7372c02b0ce3618e96afe
22 changes: 18 additions & 4 deletions src/node_errors.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,8 @@ void TriggerUncaughtException(Isolate* isolate,
process_object->Get(env->context(),
fatal_exception_string).ToLocalChecked();
// If the exception happens before process._fatalException is attached
// during bootstrap, or if the user has patched it incorrectly, just crash.
// during bootstrap, or if the user has patched it incorrectly, exit
// the current Node.js instance.
if (!fatal_exception_function->IsFunction()) {
ReportException(env, error, message);
env->Exit(6);
Expand All @@ -880,16 +881,29 @@ void TriggerUncaughtException(Isolate* isolate,
MaybeLocal<Value> handled;
{
// We do not expect the global uncaught exception itself to throw any more
// exceptions. If it does, crash.
errors::TryCatchScope fatal_try_catch(
env, errors::TryCatchScope::CatchMode::kFatal);
// exceptions. If it does, exit the current Node.js instance.
errors::TryCatchScope try_catch(env,
errors::TryCatchScope::CatchMode::kFatal);
// Explicitly disable verbose exception reporting -
// if process._fatalException() throws an error, we don't want it to
// trigger the per-isolate message listener which will call this
// function and recurse.
try_catch.SetVerbose(false);
Local<Value> argv[2] = { error,
Boolean::New(env->isolate(), from_promise) };

handled = fatal_exception_function.As<Function>()->Call(
env->context(), process_object, arraysize(argv), argv);
}

// If process._fatalException() throws, we are now exiting the Node.js
// instance so return to continue the exit routine.
// TODO(joyeecheung): return a Maybe here to prevent the caller from
// stepping on the exit.
if (handled.IsEmpty()) {
return;
}

// The global uncaught exception handler returns true if the user handles it
// by e.g. listening to `uncaughtException`. In that case, continue program
// execution.
Expand Down