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-bug-1127780.patch | |
| parent | 614c2188420a266ec512c9c04af3bb2ea46c4dc4 (diff) | |
| download | guix-4c153a9125fa0913077b06b5ed537958ae4ca163.tar.gz guix-4c153a9125fa0913077b06b5ed537958ae4ca163.zip | |
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-bug-1127780.patch')
| -rw-r--r-- | gnu/packages/patches/icecat-bug-1127780.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/gnu/packages/patches/icecat-bug-1127780.patch b/gnu/packages/patches/icecat-bug-1127780.patch new file mode 100644 index 0000000000..c433616087 --- /dev/null +++ b/gnu/packages/patches/icecat-bug-1127780.patch @@ -0,0 +1,25 @@ +From cf1de3d04302841aaa05aed8364da3399cbca9b4 Mon Sep 17 00:00:00 2001 +From: Bobby Holley <bobbyholley@gmail.com> +Date: Tue, 17 Feb 2015 17:47:12 -0500 +Subject: [PATCH] Bug 1127780 - Add null check. r=bz, a=bkerensa + +--- + js/xpconnect/wrappers/XrayWrapper.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/xpconnect/wrappers/XrayWrapper.h b/js/xpconnect/wrappers/XrayWrapper.h +index ead095f1..cc8c580 100644 +--- a/js/xpconnect/wrappers/XrayWrapper.h ++++ b/js/xpconnect/wrappers/XrayWrapper.h +@@ -131,7 +131,7 @@ class XrayWrapper : public Base { + { + if (!Base::getPrototypeOf(cx, wrapper, protop)) + return false; +- if (WrapperFactory::IsXrayWrapper(protop)) ++ if (!protop || WrapperFactory::IsXrayWrapper(protop)) + return true; + + protop.set(JS_GetObjectPrototype(cx, wrapper)); +-- +2.2.1 + |