mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
40cdfdb1d1
* chore: bump node in DEPS to v22.18.0 * crypto: fix inclusion of OPENSSL_IS_BORINGSSL define https://github.com/nodejs/node/pull/58845 * crypto: fix SHAKE128/256 breaking change introduced with OpenSSL 3.4 https://github.com/nodejs/node/pull/58960 * permission: propagate permission model flags on spawn https://github.com/nodejs/node/pull/58853 * esm: syncify default path of ModuleLoader\.load https://github.com/nodejs/node/pull/57419 * src: remove fast API for InternalModuleStat https://github.com/nodejs/node/pull/58489 * src: simplify adding fast APIs to ExternalReferenceRegistry https://github.com/nodejs/node/pull/58896/ * chore: fixup patch indices * src: fix internalModuleStat v8 fast path https://github.com/nodejs/node/pull/58054 * test: add tests to ensure that node.1 is kept in sync with cli.md https://github.com/nodejs/node/pull/58878 * crypto: fix SHAKE128/256 breaking change introduced with OpenSSL 3.4 https://github.com/nodejs/node/pull/58942 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
68 lines
3.0 KiB
Diff
68 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Wed, 16 Aug 2023 19:15:29 +0200
|
|
Subject: fix: assert module in the renderer process
|
|
|
|
When creating a Node.js Environment, embedders have the option to disable Node.js'
|
|
default overriding of Error.prepareStackTrace. However, the assert module depends on
|
|
a WeakMap that is populated with the error stacktraces in the overridden function.
|
|
|
|
This adds handling to fall back to the default implementation if Error.prepareStackTrace
|
|
if the override has been disabled.
|
|
|
|
This will be upstreamed.
|
|
|
|
diff --git a/lib/internal/assert/utils.js b/lib/internal/assert/utils.js
|
|
index d059fa89baf7d4f7d921d00871a97494be4a166a..a0f7fd2e4512e9b4196bbf5fe4390b00e5e2d9a8 100644
|
|
--- a/lib/internal/assert/utils.js
|
|
+++ b/lib/internal/assert/utils.js
|
|
@@ -24,6 +24,7 @@ const AssertionError = require('internal/assert/assertion_error');
|
|
const { openSync, closeSync, readSync } = require('fs');
|
|
const { EOL } = require('internal/constants');
|
|
const { BuiltinModule } = require('internal/bootstrap/realm');
|
|
+const { getEmbedderOptions } = require('internal/options');
|
|
const { isError } = require('internal/util');
|
|
|
|
const errorCache = new SafeMap();
|
|
@@ -166,8 +167,16 @@ function getErrMessage(message, fn) {
|
|
ErrorCaptureStackTrace(err, fn);
|
|
if (errorStackTraceLimitIsWritable) Error.stackTraceLimit = tmpLimit;
|
|
|
|
- overrideStackTrace.set(err, (_, stack) => stack);
|
|
- const call = err.stack[0];
|
|
+ let call;
|
|
+ if (getEmbedderOptions().hasPrepareStackTraceCallback) {
|
|
+ overrideStackTrace.set(err, (_, stack) => stack);
|
|
+ call = err.stack[0];
|
|
+ } else {
|
|
+ const tmpPrepare = Error.prepareStackTrace;
|
|
+ Error.prepareStackTrace = (_, stack) => stack;
|
|
+ call = err.stack[0];
|
|
+ Error.prepareStackTrace = tmpPrepare;
|
|
+ }
|
|
|
|
let filename = call.getFileName();
|
|
const line = call.getLineNumber() - 1;
|
|
diff --git a/src/node_options.cc b/src/node_options.cc
|
|
index 9cf107b1048208ffcb69ff91e0d36ffacc741805..367f7d9b1450e4d9e6d8fef36a2234e7d1344804 100644
|
|
--- a/src/node_options.cc
|
|
+++ b/src/node_options.cc
|
|
@@ -1566,14 +1566,16 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {
|
|
}
|
|
Isolate* isolate = args.GetIsolate();
|
|
|
|
- constexpr size_t kOptionsSize = 4;
|
|
+ constexpr size_t kOptionsSize = 5;
|
|
std::array<Local<Name>, kOptionsSize> names = {
|
|
+ FIXED_ONE_BYTE_STRING(env->isolate(), "hasPrepareStackTraceCallback"),
|
|
FIXED_ONE_BYTE_STRING(env->isolate(), "shouldNotRegisterESMLoader"),
|
|
FIXED_ONE_BYTE_STRING(env->isolate(), "noGlobalSearchPaths"),
|
|
FIXED_ONE_BYTE_STRING(env->isolate(), "noBrowserGlobals"),
|
|
FIXED_ONE_BYTE_STRING(env->isolate(), "hasEmbedderPreload")};
|
|
|
|
std::array<Local<Value>, kOptionsSize> values = {
|
|
+ Boolean::New(isolate, env->prepare_stack_trace_callback().IsEmpty()),
|
|
Boolean::New(isolate, env->should_not_register_esm_loader()),
|
|
Boolean::New(isolate, env->no_global_search_paths()),
|
|
Boolean::New(isolate, env->no_browser_globals()),
|