Handling possible exception in stringification of window.location. Fi…

…xes issue 3908
SeleniumHQ · Jul 3, 2014 · 5ef0217 · 5ef0217
1 parent 00f9afe
commit 5ef0217
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/javascript/selenium-core/scripts/selenium-api.js b/javascript/selenium-core/scripts/selenium-api.js
@@ -1189,10 +1189,15 @@ Selenium.prototype.doWaitForPopUp = function(windowID, timeout) {
                 throw e;
             }
         }
-        
+
         if (!targetWindow) return false;
-        if (!targetWindow.location) return false;
-        if ("about:blank" == targetWindow.location) return false;
+        try {
+            if (!targetWindow.location) return false;
+            if ("about:blank" == targetWindow.location) return false;
+        } catch (e) {
+            LOG.debug("Location exception (" + e.message + ")!");
+            return false;
+        }
         if (browserVersion.isKonqueror) {
             if ("/" == targetWindow.location.href) {
                 // apparently Konqueror uses this as the temporary location, instead of about:blank