diff options
| author | Ruben Rodriguez <ruben@gnu.org> | 2015-08-22 16:42:16 -0500 |
|---|---|---|
| committer | Ruben Rodriguez <ruben@gnu.org> | 2015-08-22 16:42:16 -0500 |
| commit | 4d18722d200805d5e56e8cd1dcfac61451f4f4f0 (patch) | |
| tree | f7e029f727f3c819984d53e369cb66609895322e /data/patches/icecat-CVE-2015-4495.patch | |
| parent | 3dd056d2b3e1569f23118196fb3af32cd7802b65 (diff) | |
Applied patch for CVE-2015-4473 CVE-2015-4482 CVE-2015-4488 CVE-2015-4489 CVE-2015-4491 CVE-2015-4492 CVE-2015-4495 from Guix
Diffstat (limited to 'data/patches/icecat-CVE-2015-4495.patch')
| -rw-r--r-- | data/patches/icecat-CVE-2015-4495.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/data/patches/icecat-CVE-2015-4495.patch b/data/patches/icecat-CVE-2015-4495.patch new file mode 100644 index 0000000..e7514d9 --- /dev/null +++ b/data/patches/icecat-CVE-2015-4495.patch @@ -0,0 +1,28 @@ +Backported from upstream commits labelled "Bug 1178058" from the esr38 branch +by Boris Zbarsky <bzbarsky@mit.edu> and Bobby Holley <bobbyholley@gmail.com>. + +--- icecat-31.8.0/docshell/base/nsDocShell.cpp ++++ icecat-31.8.0/docshell/base/nsDocShell.cpp +@@ -1546,12 +1546,21 @@ + + if (owner && mItemType != typeChrome) { + nsCOMPtr<nsIPrincipal> ownerPrincipal = do_QueryInterface(owner); +- if (nsContentUtils::IsSystemOrExpandedPrincipal(ownerPrincipal)) { ++ if (nsContentUtils::IsSystemPrincipal(ownerPrincipal)) { + if (ownerIsExplicit) { + return NS_ERROR_DOM_SECURITY_ERR; + } + owner = nullptr; + inheritOwner = true; ++ } else if (nsContentUtils::IsExpandedPrincipal(ownerPrincipal)) { ++ if (ownerIsExplicit) { ++ return NS_ERROR_DOM_SECURITY_ERR; ++ } ++ // Don't inherit from the current page. Just do the safe thing ++ // and pretend that we were loaded by a nullprincipal. ++ owner = do_CreateInstance("@mozilla.org/nullprincipal;1"); ++ NS_ENSURE_TRUE(owner, NS_ERROR_FAILURE); ++ inheritOwner = false; + } + } + if (!owner && !inheritOwner && !ownerIsExplicit) { |