From c646efc9689bec66cea027b5f67a4bc22a4604cb Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Fri, 23 Oct 2015 23:06:22 -0500 Subject: Deleted extra patch files left in rebase --- data/patches/icecat-CVE-2015-4495.patch | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 data/patches/icecat-CVE-2015-4495.patch (limited to 'data/patches/icecat-CVE-2015-4495.patch') diff --git a/data/patches/icecat-CVE-2015-4495.patch b/data/patches/icecat-CVE-2015-4495.patch deleted file mode 100644 index e7514d9..0000000 --- a/data/patches/icecat-CVE-2015-4495.patch +++ /dev/null @@ -1,28 +0,0 @@ -Backported from upstream commits labelled "Bug 1178058" from the esr38 branch -by Boris Zbarsky and Bobby Holley . - ---- 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 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) { -- cgit v1.2.3