Commit 658a266
src: allow preventing SetPrepareStackTraceCallback
Node.js sets a stack trace handler specific to the v8::Context
corresponding to the current Environment. When Electron is running in a
non-Node.js v8::Context (e.g in the renderer process with
contextIsolation enabled), there will be no correspondent Environment -
we therefore need to prevent this handler being set so that Blink falls
back to its default handling and displays the correct stacktrace.
PR-URL: #36447
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent a6c6cbb commit 658a266
2 files changed
Lines changed: 7 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -228,9 +228,11 @@ void SetIsolateErrorHandlers(v8::Isolate* isolate, const IsolateSettings& s) { | |||
| 228 | 228 | s.fatal_error_callback : OnFatalError; | |
| 229 | 229 | isolate->SetFatalErrorHandler(fatal_error_cb); | |
| 230 | 230 | ||
| 231 | - auto* prepare_stack_trace_cb = s.prepare_stack_trace_callback ? | ||
| 232 | - s.prepare_stack_trace_callback : PrepareStackTraceCallback; | ||
| 233 | - isolate->SetPrepareStackTraceCallback(prepare_stack_trace_cb); | ||
| 231 | + if ((s.flags & SHOULD_NOT_SET_PREPARE_STACK_TRACE_CALLBACK) == 0) { | ||
| 232 | + auto* prepare_stack_trace_cb = s.prepare_stack_trace_callback ? | ||
| 233 | + s.prepare_stack_trace_callback : PrepareStackTraceCallback; | ||
| 234 | + isolate->SetPrepareStackTraceCallback(prepare_stack_trace_cb); | ||
| 235 | + } | ||
| 234 | 236 | } | |
| 235 | 237 | ||
| 236 | 238 | void SetIsolateMiscHandlers(v8::Isolate* isolate, const IsolateSettings& s) { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -336,7 +336,8 @@ class NODE_EXTERN MultiIsolatePlatform : public v8::Platform { | |||
| 336 | 336 | enum IsolateSettingsFlags { | |
| 337 | 337 | MESSAGE_LISTENER_WITH_ERROR_LEVEL = 1 << 0, | |
| 338 | 338 | DETAILED_SOURCE_POSITIONS_FOR_PROFILING = 1 << 1, | |
| 339 | - SHOULD_NOT_SET_PROMISE_REJECTION_CALLBACK = 1 << 2 | ||
| 339 | + SHOULD_NOT_SET_PROMISE_REJECTION_CALLBACK = 1 << 2, | ||
| 340 | + SHOULD_NOT_SET_PREPARE_STACK_TRACE_CALLBACK = 1 << 3 | ||
| 340 | 341 | }; | |
| 341 | 342 | ||
| 342 | 343 | struct IsolateSettings { | |
0 commit comments