← Back to branch summary

~ubuntu-branches/ubuntu/precise/tiff/precise-security

« back to all changes in this revision

Viewing changes to debian/patches/CVE-2014-81xx-7.patch

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-03-30 08:11:18 UTC
  • Revision ID: package-import@ubuntu.com-20150330081118-bvaoaii1act27voq
Tags: 3.9.5-2ubuntu1.7
* SECURITY UPDATE: Fix multiple security issues
  - debian/patches/CVE-2014-81xx-1.patch to CVE-2014-81xx-11.patch
  - debian/patches/CVE-2014-8128-5.patch
  - debian/patches/CVE-2014-9655-1.patch to CVE-2014-9655-3.patch
  - debian/patches/read_overrun.patch
  - debian/patches/CVE-2014-8130.patch
  - CVE-2014-8127 (partially)
  - CVE-2014-8128
  - CVE-2014-8129
  - CVE-2014-8130
  - CVE-2014-9330
  - CVE-2014-9655

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/CVE-2014-81xx-7.patch
 
1
From 3996fa0f84f4a8b7e65fe4b8f0681711022034ea Mon Sep 17 00:00:00 2001
 
2
From: erouault <erouault>
 
3
Date: Sun, 21 Dec 2014 20:04:31 +0000
 
4
Subject: [PATCH] * tools/pal2rgb.c, tools/thumbnail.c: fix crash by disabling
 
5
 TIFFTAG_INKNAMES copying. The right fix would be to properly copy it, but not
 
6
 worth the burden for those esoteric utilities.
 
7
 http://bugzilla.maptools.org/show_bug.cgi?id=2484 (CVE-2014-8127)
 
8
 
 
9
---
 
10
 ChangeLog         | 7 +++++++
 
11
 tools/pal2rgb.c   | 2 +-
 
12
 tools/thumbnail.c | 2 +-
 
13
 3 files changed, 9 insertions(+), 2 deletions(-)
 
14
 
 
15
Index: tiff-3.9.5/tools/pal2rgb.c
 
16
===================================================================
 
17
--- tiff-3.9.5.orig/tools/pal2rgb.c     2015-03-30 07:47:16.877168091 -0400
 
18
+++ tiff-3.9.5/tools/pal2rgb.c  2015-03-30 07:47:16.877168091 -0400
 
19
@@ -368,7 +368,7 @@
 
20
     { TIFFTAG_CLEANFAXDATA,            1, TIFF_SHORT },
 
21
     { TIFFTAG_CONSECUTIVEBADFAXLINES,  1, TIFF_LONG },
 
22
     { TIFFTAG_INKSET,                  1, TIFF_SHORT },
 
23
-    { TIFFTAG_INKNAMES,                        1, TIFF_ASCII },
 
24
+    /*{ TIFFTAG_INKNAMES,                      1, TIFF_ASCII },*/ /* Needs much more complicated logic. See tiffcp */
 
25
     { TIFFTAG_DOTRANGE,                        2, TIFF_SHORT },
 
26
     { TIFFTAG_TARGETPRINTER,           1, TIFF_ASCII },
 
27
     { TIFFTAG_SAMPLEFORMAT,            1, TIFF_SHORT },
 
28
Index: tiff-3.9.5/tools/thumbnail.c
 
29
===================================================================
 
30
--- tiff-3.9.5.orig/tools/thumbnail.c   2015-03-30 07:47:16.877168091 -0400
 
31
+++ tiff-3.9.5/tools/thumbnail.c        2015-03-30 07:47:16.877168091 -0400
 
32
@@ -237,7 +237,7 @@
 
33
     { TIFFTAG_CLEANFAXDATA,            1, TIFF_SHORT },
 
34
     { TIFFTAG_CONSECUTIVEBADFAXLINES,  1, TIFF_LONG },
 
35
     { TIFFTAG_INKSET,                  1, TIFF_SHORT },
 
36
-    { TIFFTAG_INKNAMES,                        1, TIFF_ASCII },
 
37
+    /*{ TIFFTAG_INKNAMES,                      1, TIFF_ASCII },*/ /* Needs much more complicated logic. See tiffcp */
 
38
     { TIFFTAG_DOTRANGE,                        2, TIFF_SHORT },
 
39
     { TIFFTAG_TARGETPRINTER,           1, TIFF_ASCII },
 
40
     { TIFFTAG_SAMPLEFORMAT,            1, TIFF_SHORT },