Bug 1265262 - Check for null root branch when registering pref watcher. r=froydnj

2016-08-10 12:48:55 -07:00
parent 749e1322ab
commit c8df7e66fb
1 changed files with 6 additions and 2 deletions
--- a/xpcom/base/LogModulePrefWatcher.cpp
+++ b/xpcom/base/LogModulePrefWatcher.cpp
@@ -51,10 +51,14 @@ LoadPrefValue(const char* aName)
 void
 LoadExistingPrefs()
 {
+  nsIPrefBranch* root = Preferences::GetRootBranch();
+  if (!root) {
+    return;
+  }
+
  uint32_t count;
  char** names;
-  nsresult rv = Preferences::GetRootBranch()->
-      GetChildList(kLoggingPrefPrefix, &count, &names);
+  nsresult rv = root->GetChildList(kLoggingPrefPrefix, &count, &names);
  if (NS_SUCCEEDED(rv) && count) {
    for (size_t i = 0; i < count; i++) {
      LoadPrefValue(names[i]);