Skip to content

Commit

Permalink
fix: renderer crash on setImmediate
Browse files Browse the repository at this point in the history
  • Loading branch information
codebytere committed Nov 6, 2020
1 parent 2daca0f commit f02538c
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions shell/common/node_bindings.cc
Expand Up @@ -170,6 +170,20 @@ bool AllowWasmCodeGenerationCallback(v8::Local<v8::Context> context,
v8::String::Empty(isolate));
}

void ErrorMessageListener(v8::Local<v8::Message> message,
v8::Local<v8::Value> data) {
v8::Isolate* isolate = v8::Isolate::GetCurrent();
node::Environment* env = node::Environment::GetCurrent(isolate);

// TODO(codebytere): properly emit the after() hooks now
// that the exception has been handled.
// See node/lib/internal/process/execution.js#L176-L180

// Ensure that the async id stack is properly cleared so the async
// hook stack does not becomes corrupted.
env->async_hooks()->clear_async_id_stack();
}

// Initialize Node.js cli options to pass to Node.js
// See https://nodejs.org/api/cli.html#cli_options
void SetNodeCliFlags() {
Expand Down Expand Up @@ -470,6 +484,12 @@ node::Environment* NodeBindings::CreateEnvironment(
// Blink's.
is.flags &= ~node::IsolateSettingsFlags::MESSAGE_LISTENER_WITH_ERROR_LEVEL;

// Isolate message listeners are additive (you can add multiple), so instead
// we add an extra one here to ensure that the async hook stack is properly
// cleared when errors are thrown.
context->GetIsolate()->AddMessageListenerWithErrorLevel(
ErrorMessageListener, v8::Isolate::kMessageError);

// We do not want to use the promise rejection callback that Node.js uses,
// because it does not send PromiseRejectionEvents to the global script
// context. We need to use the one Blink already provides.
Expand Down

0 comments on commit f02538c

Please sign in to comment.