From 593ded98f6f8eff50d2d9e641920efb4745ba5db Mon Sep 17 00:00:00 2001 From: Michael Kochell Date: Tue, 1 Oct 2019 12:17:08 -0600 Subject: [PATCH] [MM-18936] Guard against bad server url so app doesn't crash (#1049) * guard against invalid server url so app doesn't crash * move if statement and add try/catch --- src/main.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index f715717b..fab48c46 100644 --- a/src/main.js +++ b/src/main.js @@ -764,10 +764,19 @@ function handleMainWindowWebContentsCrashed() { // function isTrustedURL(url) { + if (!url) { + return false; + } + let parsedUrl = url; if (typeof url === 'string') { - parsedUrl = new URL(url); + try { + parsedUrl = new URL(url); + } catch (e) { + return false; + } } + const trustedURLs = config.teams.map((team) => new URL(team.url)); for (const trustedURL of trustedURLs) {