Additional safety in window functions

Author: Daniel Brain

src/lib/windows.js

@@ -46,22 +46,24 @@ export function isWindow(item) {
         return false;
     }
 
-    try {
+    if (isSameDomain(item)) {
+        try {
 
-        for (let key of [ 'setTimeout', 'setInterval', 'postMessage', 'alert' ]) {
-            if (typeof item[key] !== 'function') {
-                return false;
+            for (let key of [ 'setTimeout', 'setInterval', 'postMessage', 'alert' ]) {
+                if (typeof item[key] !== 'function') {
+                    return false;
+                }
             }
-        }
 
-        if (!item.document || !item.location) {
-            return false;
-        }
+            if (!item.document || !item.location) {
+                return false;
+            }
 
-        return true;
+            return true;
 
-    } catch (err) {
-        // pass
+        } catch (err) {
+            // pass
+        }
     }
 
     try {
@@ -85,7 +87,11 @@ export function isWindowClosed(win) {
 
     try {
 
-        if (!win || win.closed || (isSameDomain(win) && util.safeGet(win, 'mockclosed'))) {
+        if (!win || win.closed) {
+            return true;
+        }
+
+        if (isSameDomain(win) && util.safeGet(win, 'mockclosed')) {
             return true;
         }
 
@@ -201,31 +207,24 @@ export function getFrames(win) {
 
             result.push(frame);
         }
-    } else {
 
-        let i = 0;
-
-        while (true) {
-            let frame;
-
-            try {
-                frame = frames[i];
-            } catch (err) {
-                return result;
-            }
-
-            if (!frame) {
-                return result;
-            }
+        return result;
+    }
 
-            result.push(frame);
+    for (let i = 0; i < 100; i++) {
+        let frame;
 
-            i += 1;
+        try {
+            frame = frames[i];
+        } catch (err) {
+            return result;
+        }
 
-            if (i > 20) {
-                return result;
-            }
+        if (!frame) {
+            return result;
         }
+
+        result.push(frame);
     }
 
     return result;