diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-03-25 08:20:49 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-03-25 08:24:10 -0400 |
| commit | 4c153a9125fa0913077b06b5ed537958ae4ca163 (patch) | |
| tree | 15367cb88523e11c50cbdd65c97b0b254e7c525a /gnu/packages/patches/icecat-CVE-2015-0818-pt2.patch | |
| parent | 614c2188420a266ec512c9c04af3bb2ea46c4dc4 (diff) | |
| download | gnu-guix-4c153a9125fa0913077b06b5ed537958ae4ca163.tar gnu-guix-4c153a9125fa0913077b06b5ed537958ae4ca163.tar.gz | |
gnu: icecat: Apply fixes for CVE-2015-{0817,0818} and other selected bugs.
* gnu/packages/patches/icecat-CVE-2015-0817.patch,
gnu/packages/patches/icecat-CVE-2015-0818-pt1.patch,
gnu/packages/patches/icecat-CVE-2015-0818-pt2.patch,
gnu/packages/patches/icecat-bug-1127780.patch,
gnu/packages/patches/icecat-bug-1144991.patch,
gnu/packages/patches/icecat-bug-1145870.patch,
gnu/packages/patches/icecat-bug-1146339.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/gnuzilla.scm (icecat): Add patches.
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2015-0818-pt2.patch')
| -rw-r--r-- | gnu/packages/patches/icecat-CVE-2015-0818-pt2.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2015-0818-pt2.patch b/gnu/packages/patches/icecat-CVE-2015-0818-pt2.patch new file mode 100644 index 0000000000..4eac5df4db --- /dev/null +++ b/gnu/packages/patches/icecat-CVE-2015-0818-pt2.patch @@ -0,0 +1,28 @@ +From 83364c747c421b191f9d4012896a9e5a1d5223ad Mon Sep 17 00:00:00 2001 +From: Kyle Huey <khuey@kylehuey.com> +Date: Fri, 20 Mar 2015 19:15:13 -0700 +Subject: [PATCH] Bug 1144988. r=bz a=lmandel + +--- + docshell/base/nsDocShell.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp +index 4cddcef..bdf88a5cf 100644 +--- a/docshell/base/nsDocShell.cpp ++++ b/docshell/base/nsDocShell.cpp +@@ -1322,9 +1322,10 @@ nsDocShell::LoadURI(nsIURI * aURI, + + // Note: we allow loads to get through here even if mFiredUnloadEvent is + // true; that case will get handled in LoadInternal or LoadHistoryEntry. +- if (IsPrintingOrPP()) { ++ if (IsPrintingOrPP() || mBlockNavigation) { + return NS_OK; // JS may not handle returning of an error code + } ++ + nsCOMPtr<nsIURI> referrer; + nsCOMPtr<nsIInputStream> postStream; + nsCOMPtr<nsIInputStream> headersStream; +-- +2.2.1 + |