fix: don't re-parse URL unnecessarily when handling dialogs (#50400)

trop[bot] · nmggithub · web-flow · commit 13e44072be36 · 2026-03-20T17:31:06.000-04:00
* fix: fallback to opaque URL when needed inside dialog callback

Co-authored-by: Noah Gregory &lt;noahmgregory@gmail.com&gt;

* refactor: remove additional URL parsing entirely when showing dialogs

Co-authored-by: Noah Gregory &lt;noahmgregory@gmail.com&gt;

* test: add crash test case for URL-less dialogs

Co-authored-by: Noah Gregory &lt;noahmgregory@gmail.com&gt;

* refactor: exit on events instead of on timeout for dialog crash test

Co-authored-by: Robo &lt;hop2deep@gmail.com&gt;

Co-authored-by: Noah Gregory &lt;noahmgregory@gmail.com&gt;

* style: make linter happy

Co-authored-by: Noah Gregory &lt;noahmgregory@gmail.com&gt;

* style: make linter actually happy

Co-authored-by: Noah Gregory &lt;noahmgregory@gmail.com&gt;

* fix: address failing `safeDialogs` tests

Co-authored-by: Noah Gregory &lt;noahmgregory@gmail.com&gt;

---------

Co-authored-by: trop[bot] &lt;37223003+trop[bot]@users.noreply.github.com&gt;
Co-authored-by: Noah Gregory &lt;noahmgregory@gmail.com&gt;
diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
@@ -777,8 +777,7 @@ WebContents.prototype._init = function () {
   const originCounts = new Map<string, number>();
   const openDialogs = new Set<AbortController>();
   this.on('-run-dialog', async (info, callback) => {
-    const originUrl = new URL(info.frame.url);
-    const origin = originUrl.protocol === 'file:' ? originUrl.href : originUrl.origin;
+    const origin = info.frame.origin === 'file://' ? info.frame.url : info.frame.origin;
     if ((originCounts.get(origin) ?? 0) < 0) return callback(false, '');
 
     const prefs = this.getLastWebPreferences();
diff --git a/spec/fixtures/crash-cases/dialog-on-invalid-url/index.html b/spec/fixtures/crash-cases/dialog-on-invalid-url/index.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<script>
+window.open('javascript:alert()');
+</script>
+</body>
+</html>
diff --git a/spec/fixtures/crash-cases/dialog-on-invalid-url/index.js b/spec/fixtures/crash-cases/dialog-on-invalid-url/index.js
@@ -0,0 +1,22 @@
+const { app, BrowserWindow } = require('electron');
+
+process.on('uncaughtException', (err) => {
+  console.error(err);
+  process.exit(1);
+});
+
+process.on('unhandledRejection', (reason) => {
+  console.error(reason);
+  process.exit(1);
+});
+
+app.on('browser-window-created', (_, window) => {
+  window.webContents.once('did-frame-navigate', () => {
+    process.exit(0);
+  });
+});
+
+app.whenReady().then(() => {
+  const win = new BrowserWindow({ show: false });
+  win.loadFile('index.html');
+});
