Issue 656 - Replace some __proto__ with Object.create

lib/filterStorage.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 81 matching lines @@
   /**
    * Will be set to true if no patterns.ini file exists.
    * @type Boolean
    */
   firstRun: false,
 
   /**
    * Map of properties listed in the filter storage file before the sections
    * start. Right now this should be only the format version.
    */
-  fileProperties: {__proto__: null},
+  fileProperties: Object.create(null),
 
   /**
    * List of filter subscriptions containing all filters
    * @type Array of Subscription
    */
   subscriptions: [],
 
   /**
    * Map of subscriptions already on the list, by their URL/identifier
    * @type Object
    */
-  knownSubscriptions: {__proto__: null},
+  knownSubscriptions: Object.create(null),
 
   /**
    * Finds the filter group that a filter should be added to by default. Will
    * return null if this group doesn't exist yet.
    */
   getGroupForFilter: function(/**Filter*/ filter) /**SpecialSubscription*/
   {
     let generalSubscription = null;
     for (let subscription of FilterStorage.subscriptions)
     {
@@ skipping 288 matching lines @@
         doneReading(parser);
       }.bind(this), "FilterStorageRead");
 
       TimeLine.leave("FilterStorage.loadFromDisk() <- readFile()", "FilterStorageRead");
     }.bind(this);
 
     var doneReading = function(parser)
     {
       // Old special groups might have been converted, remove them if they are empty
       let specialMap = {"~il~": true, "~wl~": true, "~fl~": true, "~eh~": true};
-      let knownSubscriptions = {__proto__: null};
+      let knownSubscriptions = Object.create(null);
       for (let i = 0; i < parser.subscriptions.length; i++)
       {
         let subscription = parser.subscriptions[i];
         if (subscription instanceof SpecialSubscription && subscription.filters.length == 0 && subscription.url in specialMap)
           parser.subscriptions.splice(i--, 1);
         else
           knownSubscriptions[subscription.url] = subscription;
       }
 
       this.fileProperties = parser.fileProperties;
@@ skipping 53 matching lines @@
     }
 
     TimeLine.leave("FilterStorage.loadFromDisk() done");
   },
 
   _generateFilterData: function(subscriptions)
   {
     yield "# Adblock Plus preferences";
     yield "version=" + formatVersion;
 
-    let saved = {__proto__: null};
+    let saved = Object.create(null);
     let buf = [];
 
     // Save filter data
     for (let i = 0; i < subscriptions.length; i++)
     {
       let subscription = subscriptions[i];
       for (let j = 0; j < subscription.filters.length; j++)
       {
         let filter = subscription.filters[j];
         if (!(filter.text in saved))
@@ skipping 279 matching lines @@
 PrivateBrowsing.init();
 
 /**
  * IO.readFromFile() listener to parse filter data.
  * @constructor
  */
 function INIParser()
 {
   this.fileProperties = this.curObj = {};
   this.subscriptions = [];
-  this.knownFilters = {__proto__: null};
-  this.knownSubscriptions = {__proto__: null};
+  this.knownFilters = Object.create(null);
+  this.knownSubscriptions = Object.create(null);
 }
 INIParser.prototype =
 {
   linesProcessed: 0,
   subscriptions: null,
   knownFilters: null,
   knownSubscriptions : null,
   wantObj: true,
   fileProperties: null,
   curObj: null,
@@ skipping 79 matching lines @@
       Subscription.knownSubscriptions = origKnownSubscriptions;
     }
 
     // Allow events to be processed every now and then.
     // Note: IO.readFromFile() will deal with the potential reentrance here.
     this.linesProcessed++;
     if (this.linesProcessed % 1000 == 0)
       Utils.yield();
   }
 };