From dacddd5d44a1dd1331944a736357b451ffcbacaf Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sun, 26 Dec 2021 20:47:13 +0900 Subject: [PATCH] Fix JS exception when malformed URL is passed to isSameOrigin() --- common/js/common.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/common/js/common.js b/common/js/common.js index 6741f8cf3..a10bac799 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -42,10 +42,14 @@ if (url1.match(/^(https?:)?\/\/[^\/]*[^a-z0-9\/.:_-]/i) || url2.match(/^(https?:)?\/\/[^\/]*[^a-z0-9\/.:_-]/i)) { return false; } - - url1 = window.XE.URI(url1).normalizePort().normalizeHostname().normalizePathname().origin(); - url2 = window.XE.URI(url2).normalizePort().normalizeHostname().normalizePathname().origin(); - return (url1 === url2) ? true : false; + + try { + url1 = window.XE.URI(url1).normalizePort().normalizeHostname().normalizePathname().origin(); + url2 = window.XE.URI(url2).normalizePort().normalizeHostname().normalizePathname().origin(); + return (url1 === url2) ? true : false; + } catch (err) { + return false; + } }; /**