Merge m-c to autoland. a=merge on a CLOSED TREE
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 30 Nov 2018 14:17:46 -0500
changeset 448995 5b9090976a4afd897b787342ef6fbbb3f73113d8
parent 448994 6637fb9b7fdd4645a666277c393df7b770203fed (current diff)
parent 448953 b1446de2dd1361ef4996ec6777f8058407523f76 (diff)
child 448996 40c896fd483b1943e2bf0fd45b0a003b0874fd31
push id35139
push userccoroiu@mozilla.com
push dateSat, 01 Dec 2018 02:30:08 +0000
treeherdermozilla-central@22425b629a9d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to autoland. a=merge on a CLOSED TREE
--- 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;
       }