Issue 656 - Replace some __proto__ with Object.create

lib/matcher.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 31 matching lines @@
    * Lookup table for keywords by the filter text
    * @type Object
    */
   keywordByFilter: null,
 
   /**
    * Removes all known filters
    */
   clear: function()
   {
-    this.filterByKeyword = {__proto__: null};
-    this.keywordByFilter = {__proto__: null};
+    this.filterByKeyword = Object.create(null);
+    this.keywordByFilter = Object.create(null);
   },
 
   /**
    * Adds a filter to the matcher
    * @param {RegExpFilter} filter
    */
   add: function(filter)
   {
     if (filter.text in this.keywordByFilter)
       return;
@@ skipping 144 matching lines @@
 
 /**
  * Combines a matcher for blocking and exception rules, automatically sorts
  * rules into two Matcher instances.
  * @constructor
  */
 function CombinedMatcher()
 {
   this.blacklist = new Matcher();
   this.whitelist = new Matcher();
-  this.keys = {__proto__: null};
-  this.resultCache = {__proto__: null};
+  this.keys = Object.create(null);
+  this.resultCache = Object.create(null);
 }
 exports.CombinedMatcher = CombinedMatcher;
 
 /**
  * Maximal number of matching cache entries to be kept
  * @type Number
  */
 CombinedMatcher.maxCacheEntries = 1000;
 
 CombinedMatcher.prototype =
@@ skipping 28 matching lines @@
    */
   cacheEntries: 0,
 
   /**
    * @see Matcher#clear
    */
   clear: function()
   {
     this.blacklist.clear();
     this.whitelist.clear();
-    this.keys = {__proto__: null};
-    this.resultCache = {__proto__: null};
+    this.keys = Object.create(null);
+    this.resultCache = Object.create(null);
     this.cacheEntries = 0;
   },
 
   /**
    * @see Matcher#add
    */
   add: function(filter)
   {
     if (filter instanceof WhitelistFilter)
     {
       if (filter.siteKeys)
       {
         for (let i = 0; i < filter.siteKeys.length; i++)
           this.keys[filter.siteKeys[i]] = filter.text;
       }
       else
         this.whitelist.add(filter);
     }
     else
       this.blacklist.add(filter);
 
     if (this.cacheEntries > 0)
     {
-      this.resultCache = {__proto__: null};
+      this.resultCache = Object.create(null);
       this.cacheEntries = 0;
     }
   },
 
   /**
    * @see Matcher#remove
    */
   remove: function(filter)
   {
     if (filter instanceof WhitelistFilter)
     {
       if (filter.siteKeys)
       {
         for (let i = 0; i < filter.siteKeys.length; i++)
           delete this.keys[filter.siteKeys[i]];
       }
       else
         this.whitelist.remove(filter);
     }
     else
       this.blacklist.remove(filter);
 
     if (this.cacheEntries > 0)
     {
-      this.resultCache = {__proto__: null};
+      this.resultCache = Object.create(null);
       this.cacheEntries = 0;
     }
   },
 
   /**
    * @see Matcher#findKeyword
    */
   findKeyword: function(filter)
   {
     if (filter instanceof WhitelistFilter)
@@ skipping 70 matching lines @@
   matchesAny: function(location, contentType, docDomain, thirdParty)
   {
     let key = location + " " + contentType + " " + docDomain + " " + thirdParty;
     if (key in this.resultCache)
       return this.resultCache[key];
 
     let result = this.matchesAnyInternal(location, contentType, docDomain, thirdParty);
 
     if (this.cacheEntries >= CombinedMatcher.maxCacheEntries)
     {
-      this.resultCache = {__proto__: null};
+      this.resultCache = Object.create(null);
       this.cacheEntries = 0;
     }
 
     this.resultCache[key] = result;
     this.cacheEntries++;
 
     return result;
   },
 
   /**
@@ skipping 13 matching lines @@
     else
       return null;
   }
 }
 
 /**
  * Shared CombinedMatcher instance that should usually be used.
  * @type CombinedMatcher
  */
 let defaultMatcher = exports.defaultMatcher = new CombinedMatcher();