forked from pool/MozillaFirefox
f9c0480028
MFSA 2020- (bsc#1175686) * CVE-2020-15663 (bmo#1643199) Downgrade attack on the Mozilla Maintenance Service could have resulted in escalation of privilege * CVE-2020-15664 (bmo#1658214) Attacker-induced prompt for extension installation * CVE-2020-12401 (bmo#1631573) Timing-attack on ECDSA signature generation * CVE-2020-6829 (bmo#1631583) P-384 and P-521 vulnerable to an electro-magnetic side channel attack on signature generation * CVE-2020-12400 (bmo#1623116) P-384 and P-521 vulnerable to a side channel attack on modular inversion * CVE-2020-15665 (bmo#1651636) Address bar not reset when choosing to stay on a page after the beforeunload dialog is shown * CVE-2020-15666 (bmo#1450853) MediaError message property leaks cross-origin response status * CVE-2020-15667 (bmo#1653371) Heap overflow when processing an update file * CVE-2020-15668 (bmo#1651520) Data Race when reading certificate information * CVE-2020-15670 (bmo#1651001, bmo#1651449, bmo#1653626, bmo#1656957) Memory safety bugs fixed in Firefox 80 and Firefox ESR 78.2 - requires * NSPR 4.27 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=853
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
# HG changeset patch
|
|
# User Wolfgang Rosenauer
|
|
# Date 1558442915 -7200
|
|
# Tue May 21 14:48:35 2019 +0200
|
|
# Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5
|
|
# Parent bd5d1f49975deb730064a16b3079edb53c4a5f84
|
|
Do not use gconf for proxy settings if not running within Gnome
|
|
Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
===================================================================
|
|
RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v
|
|
retrieving revision 1.1
|
|
|
|
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
@@ -49,20 +49,24 @@ NS_IMETHODIMP
|
|
nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
|
|
// dbus prevents us from being threadsafe, but this routine should not block
|
|
// anyhow
|
|
*aMainThreadOnly = true;
|
|
return NS_OK;
|
|
}
|
|
|
|
void nsUnixSystemProxySettings::Init() {
|
|
- mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
|
- if (mGSettings) {
|
|
- mGSettings->GetCollectionForSchema("org.gnome.system.proxy"_ns,
|
|
- getter_AddRefs(mProxySettings));
|
|
+ const char* sessionType = PR_GetEnv("DESKTOP_SESSION");
|
|
+ if (sessionType && !strcmp(sessionType, "gnome")) {
|
|
+ mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
|
+ if (mGSettings) {
|
|
+ mGSettings->GetCollectionForSchema(
|
|
+ "org.gnome.system.proxy"_ns,
|
|
+ getter_AddRefs(mProxySettings));
|
|
+ }
|
|
}
|
|
}
|
|
|
|
nsresult nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) {
|
|
if (mProxySettings) {
|
|
nsCString proxyMode;
|
|
// Check if mode is auto
|
|
nsresult rv = mProxySettings->GetString("mode"_ns, proxyMode);
|