Issue 3568 - Block pop-ups opened via an intermediate window

lib/child/contentPolicy.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 298 matching lines @@
   // nsIObserver interface implementation
   //
   _openers: new WeakMap(),
 
   observe: function(subject, topic, data, uri)
   {
     switch (topic)
     {
       case "content-document-global-created":
       {
-        var opener = this._openers.get(subject);
-        if (!opener || Components.utils.isDeadWrapper(opener))
+        let opener = this._openers.get(subject);
+        if (opener && Components.utils.isDeadWrapper(opener))
+          opener = null;
+
+        if (!opener)
         {
           // We don't know the opener for this window yet, try to find it
           if (subject instanceof Ci.nsIDOMWindow)
             opener = subject.opener;
 
           if (!opener)
             return;
 
           // The opener might be an intermediate window, get the real one
           while (opener.location == "about:blank" && opener.opener)
@@ skipping 146 matching lines @@
         let property = (hasCols ? "cols" : "rows");
         let weights = parentNode[property].split(",");
         weights[index] = "0";
         parentNode[property] = weights.join(",");
       }
     }
     else
       node.classList.add(collapsedClass);
   }
 }