Topic 11477 - Whitelisting doesn`t deal with frames correctly

webrequest.js

Index: webrequest.js
===================================================================
--- a/webrequest.js
+++ b/webrequest.js
@@ -176,20 +176,24 @@ function checkRequest(type, tabId, url, 
   var documentHost = extractHostFromURL(documentUrl);
   var thirdParty = isThirdParty(requestHost, documentHost);
   return defaultMatcher.matchesAny(url, type, documentHost, thirdParty);
 }
 
 function isFrameWhitelisted(tabId, frameId, type)
 {
   var parent = frameId;
-  while (parent != -1)
+  var parentData = getFrameData(tabId, parent);
+  while (parentData)
   {
-    var parentData = getFrameData(tabId, parent);
-    if (!parentData)
-      break;
+    var frame = parent;
+    var frameData = parentData;
 
-    if (isWhitelisted(parentData.url, type) || "keyException" in parentData)
+    parent = frameData.parent;
+    parentData = getFrameData(tabId, parent);
+
+    var frameUrl = frameData.url;
+    var parentUrl = (parentData ? parentData.url : frameUrl);
+    if ("keyException" in frameData || isWhitelisted(frameUrl, parentUrl, type))
       return true;
-    parent = parentData.parent;
   }
   return false;
 }