f6d054f0fb
* chore: bump node in DEPS to v22.17.0
* build: use //third_party/simdutf by default in GN
https://github.com/nodejs/node/pull/58115
* chore: adjust crypto specs:
- https://github.com/nodejs/node/pull/58117
- https://github.com/nodejs/node/pull/58387
* deps: update libuv to 1.51.0
https://github.com/nodejs/node/pull/58124
* test: fix test-buffer-tostring-range on allocation failure
https://github.com/nodejs/node/pull/58416
* build: use FILE_OFFSET_BITS=64 esp. on 32-bit arch
https://github.com/nodejs/node/pull/58090
* build: use //third_party/simdutf by default in GN
https://github.com/nodejs/node/pull/58115
* inspector: add protocol method Network.dataReceived
https://github.com/nodejs/node/pull/58001
* test: force slow JSON.stringify path for overflow
https://github.com/nodejs/node/pull/58181
* chore: fixup patch indices
* 6049967: Remove protocol::Maybe and roll inspector_protocol
6049967
* chore: fixup crypto test patch
* src: fix module buffer allocation
https://github.com/nodejs/node/pull/57738
* crypto: expose process.features.openssl_is_boringssl
https://github.com/nodejs/node/pull/58387
* util: add internal assignFunctionName() function
https://github.com/nodejs/node/pull/57916
* build: fix pointer compression builds
https://github.com/nodejs/node/pull/58171
* chore: put back config options
* fixup! deps: update libuv to 1.51.0
* chore: update patches
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: patchup[bot] <73610968+patchup[bot]@users.noreply.github.com>
60 lines
2.4 KiB
Diff
60 lines
2.4 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 e848b3d5ee9b13ea3ea303eb3b57ef47ef951580..5b89c420f1a917526ab311fed52bff01637a86fe 100644
|
|
--- a/lib/child_process.js
|
|
+++ b/lib/child_process.js
|
|
@@ -62,6 +62,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,
|
|
@@ -154,7 +155,6 @@ function fork(modulePath, args = [], options) {
|
|
ArrayPrototypeSplice(execArgv, index - 1, 2);
|
|
}
|
|
}
|
|
-
|
|
args = [...execArgv, modulePath, ...args];
|
|
|
|
if (typeof options.stdio === 'string') {
|
|
@@ -610,6 +610,22 @@ function normalizeSpawnArguments(file, args, options) {
|
|
'options.windowsVerbatimArguments');
|
|
}
|
|
|
|
+ const env = options.env || process.env;
|
|
+
|
|
+ if ((process.platform === 'linux') &&
|
|
+ ObjectPrototypeHasOwnProperty(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) {
|
|
+ env.CRASHDUMP_SIGNAL_FD = fd;
|
|
+ env.CRASHPAD_HANDLER_PID = pid;
|
|
+ }
|
|
+ }
|
|
+
|
|
if (options.shell) {
|
|
validateArgumentNullCheck(options.shell, 'options.shell');
|
|
const command = ArrayPrototypeJoin([file, ...args], ' ');
|
|
@@ -643,7 +659,6 @@ function normalizeSpawnArguments(file, args, options) {
|
|
ArrayPrototypeUnshift(args, file);
|
|
}
|
|
|
|
- const env = options.env || process.env;
|
|
const envPairs = [];
|
|
|
|
// process.env.NODE_V8_COVERAGE always propagates, making it possible to
|