Skip to content

Commit

Permalink
fix: renderer crash on setImmediate (#26424)
Browse files Browse the repository at this point in the history
* fix: renderer crash on setImmediate

* spec: add a crash case

* fix: ensure env exists

* Update spec-main/fixtures/crash-cases/setimmediate-renderer-crash/index.js

Co-authored-by: Jeremy Rose <jeremya@chromium.org>

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
  • Loading branch information
3 people committed Nov 11, 2020
1 parent 79dff5f commit 07318e5
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 0 deletions.
23 changes: 23 additions & 0 deletions shell/common/node_bindings.cc
Expand Up @@ -168,6 +168,23 @@ bool AllowWasmCodeGenerationCallback(v8::Local<v8::Context> 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 become corrupted.

if (env) {
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 @@ -474,6 +491,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,0 +1,22 @@
const { app, BrowserWindow } = require('electron');
const path = require('path');

app.whenReady().then(() => {
const win = new BrowserWindow({
show: false,
webPreferences: {
nodeIntegration: true,
preload: path.resolve(__dirname, 'preload.js')
}
});

win.loadURL('about:blank');

win.webContents.on('render-process-gone', () => {
process.exit(1);
});

win.webContents.on('did-finish-load', () => {
setTimeout(() => app.quit());
});
});
@@ -0,0 +1,3 @@
setImmediate(() => {
throw new Error('oh no');
});

0 comments on commit 07318e5

Please sign in to comment.