Issue 6599 - Detect data corruption of storage.local

lib/prefs.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 309 matching lines @@
     },
     enumerable: true
   });
 }
 
 function init()
 {
   let prefs = Object.keys(defaults);
   prefs.forEach(addPreference);
 
-  let localLoaded = new Promise(resolve =>
+  let localLoaded = new Promise((resolve, reject) =>
   {
-    ext.storage.get(prefs.map(prefToKey), items =>
+    ext.storage.get(prefs.map(prefToKey)).then(items =>
     {
       for (let key in items)
         overrides[keyToPref(key)] = items[key];
 
       resolve();
-    });
+    }, reject);
   });
 
   let managedLoaded = new Promise(resolve =>
   {
     if ("managed" in browser.storage)
     {
       browser.storage.managed.get(null, items =>
       {
         // Opera doesn't support browser.storage.managed, but instead simply
         // removing the API, Opera sets browser.runtime.lastError when using it.
@@ skipping 31 matching lines @@
           eventEmitter.emit(pref);
         }
       }
     });
   }
 
   Prefs.untilLoaded = Promise.all([localLoaded, managedLoaded]).then(onLoaded);
 }
 
 init();