Bug 1278439 - Adding a missing prefs service null check in chrome/. r…

…=froydnj. --HG-- extra : rebase_source : e1a3b142818311e74c566da49534727189075b9e
dothq · Jul 14, 2016 · 2715b3a · 2715b3a
1 parent 303d9bf
commit 2715b3a
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/chrome/nsChromeRegistryChrome.cpp b/chrome/nsChromeRegistryChrome.cpp
@@ -123,15 +123,17 @@ nsChromeRegistryChrome::Init()
   nsCOMPtr<nsIPrefService> prefserv (do_GetService(NS_PREFSERVICE_CONTRACTID));
   nsCOMPtr<nsIPrefBranch> prefs;
 
-  if (safeMode)
-    prefserv->GetDefaultBranch(nullptr, getter_AddRefs(prefs));
-  else
-    prefs = do_QueryInterface(prefserv);
+  if (prefserv) {
+    if (safeMode) {
+      prefserv->GetDefaultBranch(nullptr, getter_AddRefs(prefs));
+    } else {
+      prefs = do_QueryInterface(prefserv);
+    }
+  }
 
   if (!prefs) {
     NS_WARNING("Could not get pref service!");
-  }
-  else {
+  } else {
     nsXPIDLCString provider;
     rv = prefs->GetCharPref(SELECTED_SKIN_PREF, getter_Copies(provider));
     if (NS_SUCCEEDED(rv))