Skip to content
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.

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

fix: renderer crash on setImmediate #26748

Merged
merged 1 commit into from Dec 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions shell/common/node_bindings.cc
Expand Up @@ -141,6 +141,23 @@ bool IsPackagedApp() {
#endif
}

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_OPTIONS to pass to Node.js
void SetNodeOptions(base::Environment* env) {
// Options that are unilaterally disallowed
Expand Down Expand Up @@ -379,6 +396,12 @@ node::Environment* NodeBindings::CreateEnvironment(
// Node uses the deprecated SetAutorunMicrotasks(false) mode, we should
// switch to use the scoped policy to match blink's behavior.
context->GetIsolate()->SetMicrotasksPolicy(v8::MicrotasksPolicy::kScoped);

// 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);
}

gin_helper::Dictionary process(context->GetIsolate(), env->process_object());
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');
});