AnnotationService/FeedAggregator: Nullified inner dictionaries' prototypes.

ubiquity/modules/annotation_memory.js

@@ -95,8 +95,8 @@ function NiceConnection(connection) {
 // for storage.
 
 function AnnotationService(connection) {
-  var ann = {};
-  var urls = {};
+  var ann = {__proto__: null};
+  var urls = {__proto__: null};
   var observers = [];
   var self = this;
 
@@ -117,7 +117,7 @@ function AnnotationService(connection) {
         let name = selStmt.getUTF8String(1);
         let value = selStmt.getUTF8String(2);
         if (!(uri_spec in ann)) {
-          ann[uri_spec] = {};
+          ann[uri_spec] = {__proto__: null};
           urls[uri_spec] = ioSvc.newURI(uri_spec, null, null);
         }
         ann[uri_spec][name] = value;
@@ -175,7 +175,7 @@ function AnnotationService(connection) {
     value = String(value);
 
     if (!(uri.spec in ann)) {
-      ann[uri.spec] = {};
+      ann[uri.spec] = {__proto__: null};
       urls[uri.spec] = uri;
     }
 

ubiquity/modules/feedaggregator.js

@@ -49,10 +49,10 @@ var L = LocalizationUtils.propertySelector(
 
 function FeedAggregator(feedManager, messageService, disabledCommands) {
   var self = this;
-  var commands = {};
+  var commands = {__proto__: null};
   var commandNames = [];
-  var commandsByName = {};
-  var commandsByDomain = {};
+  var commandsByName = {__proto__: null};
+  var commandsByDomain = {__proto__: null};
   var pageLoadFuncLists = [];
   var ubiquityLoadFuncLists = [];
   var feedsChanged = true;
@@ -125,10 +125,10 @@ function FeedAggregator(feedManager, messageService, disabledCommands) {
     for each (let feed in feeds) feed.refresh(anyway);
     if (!feedsChanged) return;
 
-    commands = {};
+    commands = {__proto__: null};
     commandNames = [];
-    commandsByName = {};
-    commandsByDomain = {};
+    commandsByName = {__proto__: null};
+    commandsByDomain = {__proto__: null};
     pageLoadFuncLists = [];
     ubiquityLoadFuncLists = [];
     feedsChanged = false;