Topic 11477 - Whitelisting doesn`t deal with frames correctly

webrequest.js

 /*
  * This file is part of the Adblock Plus extension,
  * Copyright (C) 2006-2012 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 163 matching lines @@
 
   var requestHost = extractHostFromURL(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;
 }