summary refs log tree commit diff
path: root/gnu/packages/patches/icecat-CVE-2014-1590.patch
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-01-30 02:37:44 -0500
committerMark H Weaver <mhw@netris.org>2015-01-30 10:54:41 -0500
commit582100a0c07a245abd1580e9caaf9896e0d0e67f (patch)
treeb9291dec4d035f299461baa75c4852a25365c533 /gnu/packages/patches/icecat-CVE-2014-1590.patch
parent686e025d79e9747adb96c1d328c799539a2ec8c3 (diff)
downloadguix-582100a0c07a245abd1580e9caaf9896e0d0e67f.tar.gz
gnu: icecat: Update to 31.4.0.
* gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch,
  gnu/packages/patches/icecat-CVE-2014-1587-bug-1072847.patch,
  gnu/packages/patches/icecat-CVE-2014-1587-bug-1079729.patch,
  gnu/packages/patches/icecat-CVE-2014-1587-bug-1080312.patch,
  gnu/packages/patches/icecat-CVE-2014-1587-bug-1089207.patch,
  gnu/packages/patches/icecat-CVE-2014-1590.patch,
  gnu/packages/patches/icecat-CVE-2014-1592.patch,
  gnu/packages/patches/icecat-CVE-2014-1593.patch,
  gnu/packages/patches/icecat-CVE-2014-1594.patch,
  gnu/packages/patches/icecat-CVE-2014-8634-pt1.patch,
  gnu/packages/patches/icecat-CVE-2014-8634-pt2.patch,
  gnu/packages/patches/icecat-CVE-2014-8638-pt1.patch,
  gnu/packages/patches/icecat-CVE-2014-8638-pt2.patch,
  gnu/packages/patches/icecat-CVE-2014-8639.patch,
  gnu/packages/patches/icecat-CVE-2014-8641.patch,
  gnu/packages/patches/icecat-armhf-xpcom.patch: Remove files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/gnuzilla.scm: Update to 31.4.0.  Remove patches.
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2014-1590.patch')
-rw-r--r--gnu/packages/patches/icecat-CVE-2014-1590.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2014-1590.patch b/gnu/packages/patches/icecat-CVE-2014-1590.patch
deleted file mode 100644
index f8513980ad..0000000000
--- a/gnu/packages/patches/icecat-CVE-2014-1590.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 50c5ca4bacf7cda77c3a7ab1b8d82ded18fb3355
-Author: Olli Pettay <Olli.Pettay@helsinki.fi>
-Date:   Sun Nov 2 22:01:55 2014 +0200
-
-    Bug 1087633 - Filter out XPConnect wrapped input streams. r=bz, a=lmandel
-
-	Modified   content/base/src/nsXMLHttpRequest.h
-diff --git a/content/base/src/nsXMLHttpRequest.h b/content/base/src/nsXMLHttpRequest.h
-index b1fc4e3..4ab4f29 100644
---- a/content/base/src/nsXMLHttpRequest.h
-+++ b/content/base/src/nsXMLHttpRequest.h
-@@ -28,7 +28,8 @@
- #include "nsIPrincipal.h"
- #include "nsIScriptObjectPrincipal.h"
- #include "nsISizeOfEventTarget.h"
--
-+#include "nsIXPConnect.h"
-+#include "nsIInputStream.h"
- #include "mozilla/Assertions.h"
- #include "mozilla/DOMEventTargetHelper.h"
- #include "mozilla/MemoryReporting.h"
-@@ -446,6 +447,11 @@ public:
-   void Send(nsIInputStream* aStream, ErrorResult& aRv)
-   {
-     NS_ASSERTION(aStream, "Null should go to string version");
-+    nsCOMPtr<nsIXPConnectWrappedJS> wjs = do_QueryInterface(aStream);
-+    if (wjs) {
-+      aRv.Throw(NS_ERROR_DOM_TYPE_ERR);
-+      return;
-+    }
-     aRv = Send(RequestBody(aStream));
-   }
-   void SendAsBinary(const nsAString& aBody, ErrorResult& aRv);