Merge m-c to inbound. a=merge on a CLOSED TREE
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 30 Nov 2018 14:16:46 -0500
changeset 508250 83498d8e8878200f944b593b866200bbb7ceedbf
parent 508249 bdda06babfaaed1cd12fec8ffdd107b5ca315cc5 (current diff)
parent 508169 b1446de2dd1361ef4996ec6777f8058407523f76 (diff)
child 508251 66eb1f485c1a3ea81372758bc92292c9428b17cd
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [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 inbound. 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;
       }