Bug 1511345 Follow-up: Don't blow up on empty addonStartup.json r=zombie a=RyanVM
authorAndrew Swan <aswan@mozilla.com>
Fri, 30 Nov 2018 11:12:34 -0800
changeset 505389 b1446de2dd13
parent 505388 bb2815518fc7
child 505390 950f6d29da96
child 505431 5b9090976a4a
child 505470 83498d8e8878
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerszombie, RyanVM
bugs1511345
milestone65.0a1
first release with
nightly linux32
b1446de2dd13 / 65.0a1 / 20181130191449 / files
nightly linux64
b1446de2dd13 / 65.0a1 / 20181130191449 / files
nightly mac
b1446de2dd13 / 65.0a1 / 20181130191449 / files
nightly win32
b1446de2dd13 / 65.0a1 / 20181130191449 / files
nightly win64
b1446de2dd13 / 65.0a1 / 20181130191449 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1511345 Follow-up: Don't blow up on empty addonStartup.json r=zombie a=RyanVM
toolkit/mozapps/extensions/internal/XPIProvider.jsm
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -1247,18 +1247,18 @@ var XPIStates = {
     } catch (e) {
       logger.warn("Error parsing extensions state: ${error}",
                   {error: e});
     }
 
     // When upgrading from a build prior to bug 857456, convert startup
     // metadata.
     let done = false;
-    for (let location of Object.values(state)) {
-      for (let data of Object.values(location.addons)) {
+    for (let location of Object.values(state || {})) {
+      for (let data of Object.values(location.addons || {})) {
         if (!migrateAddonLoader(data)) {
           done = true;
           break;
         }
       }
       if (done) {
         break;
       }