Commit 2715b3a3 authored by Nicholas Nethercote's avatar Nicholas Nethercote
Browse files

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

--HG--
extra : rebase_source : e1a3b142818311e74c566da49534727189075b9e
parent 303d9bf6

chrome/nsChromeRegistryChrome.cpp

+8 −6
Original line number Diff line number Diff line
@@ -123,15 +123,17 @@ nsChromeRegistryChrome::Init() 
  nsCOMPtr<nsIPrefService> prefserv (do_GetService(NS_PREFSERVICE_CONTRACTID));

  nsCOMPtr<nsIPrefBranch> prefs;



  if (safeMode)

  if (prefserv) {

    if (safeMode) {

      prefserv->GetDefaultBranch(nullptr, getter_AddRefs(prefs));

  else

    } 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))