Commit 16c34621 authored by brizental's avatar brizental
Browse files

BB 44908: Do not read AutoConfig from /etc/firefox when --disable-system-preferences 

Uplifting: https://phabricator.services.mozilla.com/D314532
parent 88be53ba

extensions/pref/autoconfig/src/nsReadConfig.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -243,7 +243,7 @@ nsresult nsReadConfig::openAndEvaluateJSFile(const char* aFileName, 
  nsCOMPtr<nsIInputStream> inStr;

  nsCOMPtr<nsIInputStream> inStr;

  if (isBinDir) {

  if (isBinDir) {

    nsCOMPtr<nsIFile> jsFile;

    nsCOMPtr<nsIFile> jsFile;

#if defined(MOZ_WIDGET_GTK)

#if defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES)

    bool exists;

    bool exists;





    rv =

    rv =
@@ -257,15 +257,15 @@ nsresult nsReadConfig::openAndEvaluateJSFile(const char* aFileName, 
    if (NS_FAILED(rv)) return rv;

    if (NS_FAILED(rv)) return rv;





    if (!exists) {

    if (!exists) {

#endif  // defined(MOZ_WIDGET_GTK)

#endif  // defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES)

      rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(jsFile));

      rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(jsFile));

      if (NS_FAILED(rv)) return rv;

      if (NS_FAILED(rv)) return rv;





      rv = jsFile->AppendNative(nsDependentCString(aFileName));

      rv = jsFile->AppendNative(nsDependentCString(aFileName));

      if (NS_FAILED(rv)) return rv;

      if (NS_FAILED(rv)) return rv;

#if defined(MOZ_WIDGET_GTK)

#if defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES)

    }

    }

#endif  // defined(MOZ_WIDGET_GTK)

#endif  // defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES)





    rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);

    rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);

    if (NS_FAILED(rv)) return rv;

    if (NS_FAILED(rv)) return rv;