Fixed: Requests by javascript: or data: frames aren`t being blocked

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 109 matching lines @@
   }
 }
 
 function recordFrame(tabId, frameId, parentFrameId, frameUrl)
 {
   if (!(tabId in frames))
     frames[tabId] = {};
   frames[tabId][frameId] = {url: frameUrl, parent: parentFrameId};
 }
 
-function getFrameUrl(tabId, frameId)
+function getFrameData(tabId, frameId)
 {
   if (tabId in frames && frameId in frames[tabId])
-    return frames[tabId][frameId].url;
+    return frames[tabId][frameId];
+  else if (frameId > 0 && tabId in frames && 0 in frames[tabId])
+  {
+    // We don't know anything about javascript: or data: frames, use top frame
+    return frames[tabId][0];
+  }
   return null;
 }
 
-function getFrameParent(tabId, frameId)
+function getFrameUrl(tabId, frameId)
 {
-  if (tabId in frames && frameId in frames[tabId])
-    return frames[tabId][frameId].parent;
-  return -1;
+  var frameData = getFrameData(tabId, frameId);
+  return (frameData ? frameData.url : null);
 }
 
 function forgetTab(tabId)
 {
   delete frames[tabId];
 }
 
 function checkRequest(type, tabId, url, frameId)
 {
   if (isFrameWhitelisted(tabId, frameId))
@@ skipping 25 matching lines @@
   }
 
   return filter;
 }
 
 function isFrameWhitelisted(tabId, frameId, type)
 {
   var parent = frameId;
   while (parent != -1)
   {
-    var parentUrl = getFrameUrl(tabId, parent);
-    if (parentUrl && isWhitelisted(parentUrl, type))
+    var parentData = getFrameData(tabId, parent);
+    if (!parentData)
+      break;
+
+    if (isWhitelisted(parentData.url, type) || "keyException" in parentData)
       return true;
-    if (parentUrl && "keyException" in frames[tabId][frameId])
-      return true;
-    parent = getFrameParent(tabId, parent);
+    parent = parentData.parent;
   }
   return false;
 }