1766511e34
* chore: bump node in DEPS to v18.18.0 * child_process: harden against prototype pollution https://github.com/nodejs/node/pull/48726 * deps: upgrade to libuv 1.46.0 https://github.com/nodejs/node/pull/49591 * module: reduce url invocations in esm/load.js https://github.com/nodejs/node/pull/48337 * Revert "test: remove test-crypto-keygen flaky designation" https://github.com/nodejs/node/pull/48652 * fix: FTBTFS in ada dep https://github.com/ada-url/ada/pull/464 https://github.com/ada-url/idna/pull/31 * fix: force_colors snapshot line number * chore: fixup patch indices * chore: update filenames.json --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
51 lines
2.1 KiB
Diff
51 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 ec39a00ddb791e6e1ebe31aa45d290e7dcc4ebfc..1cd5d8969471b276211c45a9d8d76e9b10b1bb66 100644
|
|
--- a/lib/child_process.js
|
|
+++ b/lib/child_process.js
|
|
@@ -61,6 +61,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,
|
|
@@ -162,7 +163,6 @@ function fork(modulePath, args = [], options) {
|
|
ArrayPrototypeSplice(execArgv, index - 1, 2);
|
|
}
|
|
}
|
|
-
|
|
args = [...execArgv, modulePath, ...args];
|
|
|
|
if (typeof options.stdio === 'string') {
|
|
@@ -625,6 +625,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) {
|
|
validateArgumentNullCheck(options.shell, 'options.shell');
|
|
const command = ArrayPrototypeJoin([file, ...args], ' ');
|