52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: VerteDinde <keeleymhammond@gmail.com>
|
||
|
|
Date: Sun, 20 Nov 2022 21:45:20 -0800
|
||
|
|
Subject: fix: enable crashpad for ELECTRON_RUN_AS_NODE linux processes
|
||
|
|
|
||
|
|
Passes the crashpad handler PID and crashdump signal file descriptor
|
||
|
|
to child processes spawned with `ELECTRON_RUN_AS_NODE` which is used
|
||
|
|
by the crashpad client to connect with the handler process.
|
||
|
|
|
||
|
|
diff --git a/lib/child_process.js b/lib/child_process.js
|
||
|
|
index 73c1dc769542865bdf7a2a03c16cef141d3f4b05..76151c75ef7ad420d2642c1cd11c8624b7d7e2a0 100644
|
||
|
|
--- a/lib/child_process.js
|
||
|
|
+++ b/lib/child_process.js
|
||
|
|
@@ -59,6 +59,7 @@ let debug = require('internal/util/debuglog').debuglog(
|
||
|
|
);
|
||
|
|
const { Buffer } = require('buffer');
|
||
|
|
const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
|
||
|
|
+const { getCrashdumpSignalFD, getCrashpadHandlerPID } = process._linkedBinding('electron_common_crashpad_support');
|
||
|
|
|
||
|
|
const {
|
||
|
|
AbortError,
|
||
|
|
@@ -159,7 +160,6 @@ function fork(modulePath, args = [], options) {
|
||
|
|
ArrayPrototypeSplice(execArgv, index - 1, 2);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
-
|
||
|
|
args = [...execArgv, modulePath, ...args];
|
||
|
|
|
||
|
|
if (typeof options.stdio === 'string') {
|
||
|
|
@@ -613,6 +613,21 @@ function normalizeSpawnArguments(file, args, options) {
|
||
|
|
'options.windowsVerbatimArguments');
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (process.platform === 'linux') {
|
||
|
|
+ if (ObjectPrototypeHasOwnProperty(options.env || process.env, 'ELECTRON_RUN_AS_NODE') &&
|
||
|
|
+ (file === process.execPath)) {
|
||
|
|
+ // On Linux, pass the file descriptor which crashpad handler process
|
||
|
|
+ // uses to monitor the child process and PID of the handler process.
|
||
|
|
+ // https://source.chromium.org/chromium/chromium/src/+/110.0.5415.0:components/crash/core/app/crashpad_linux.cc;l=199-206
|
||
|
|
+ const fd = getCrashdumpSignalFD();
|
||
|
|
+ const pid = getCrashpadHandlerPID();
|
||
|
|
+ if (fd !== -1 && pid !== -1) {
|
||
|
|
+ options.env.CRASHDUMP_SIGNAL_FD = fd;
|
||
|
|
+ options.env.CRASHPAD_HANDLER_PID = pid;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
if (options.shell) {
|
||
|
|
const command = ArrayPrototypeJoin([file, ...args], ' ');
|
||
|
|
// Set the shell, switches, and commands.
|