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

1 files changed, 28 insertions, 0 deletions

diff --git a/data/patches/icecat-CVE-2015-4482.patch b/data/patches/icecat-CVE-2015-4482.patch
new file mode 100644
index 0000000..41f0a3d
--- /dev/null
+++ b/data/patches/icecat-CVE-2015-4482.patch
@@ -0,0 +1,28 @@
+From 932a017c745d40d661602f6145c95c9226d8450d Mon Sep 17 00:00:00 2001
+From: Stephen Pohl <spohl.mozilla.bugs@gmail.com>
+Date: Sat, 18 Jul 2015 18:42:15 -0700
+Subject: [PATCH] Bug 1184500 - Improve handling of index names in MAR files.
+ r=rstrong, a=lmandel
+
+---
+ modules/libmar/src/mar_read.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/modules/libmar/src/mar_read.c b/modules/libmar/src/mar_read.c
+index c647370..2013b0f 100644
+--- a/modules/libmar/src/mar_read.c
++++ b/modules/libmar/src/mar_read.c
+@@ -96,6 +96,10 @@ static int mar_consume_index(MarFile *mar, char **buf, const char *buf_end) {
+     ++(*buf);
+   }
+   namelen = (*buf - name);
++  /* must ensure that namelen is valid */
++  if (namelen < 0) {
++    return -1;
++  }
+   /* consume null byte */
+   if (*buf == buf_end)
+     return -1;
+-- 
+2.4.3
+