diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-09-26 15:14:53 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-26 15:14:53 +0200 |
commit | e1556533d3e57950417b2e35a68e95c65fee5042 (patch) | |
tree | 41d67b065c7828e164af83254fb447849d9e880d /gnu/packages/patches/libtiff-CVE-2014-8127-pt1.patch | |
parent | 5d8d8f3b0a07edb3bd435830b076749f906537d8 (diff) | |
parent | 92f1cefb74f6092c0c70f93140824ab806086272 (diff) | |
download | guix-patches-e1556533d3e57950417b2e35a68e95c65fee5042.tar guix-patches-e1556533d3e57950417b2e35a68e95c65fee5042.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/patches/libtiff-CVE-2014-8127-pt1.patch')
-rw-r--r-- | gnu/packages/patches/libtiff-CVE-2014-8127-pt1.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/gnu/packages/patches/libtiff-CVE-2014-8127-pt1.patch b/gnu/packages/patches/libtiff-CVE-2014-8127-pt1.patch deleted file mode 100644 index 7f70edb86f..0000000000 --- a/gnu/packages/patches/libtiff-CVE-2014-8127-pt1.patch +++ /dev/null @@ -1,30 +0,0 @@ -Copied from Debian - -From 0782c759084daaf9e4de7ee6be7543081823455e Mon Sep 17 00:00:00 2001 -From: erouault <erouault> -Date: Sun, 21 Dec 2014 20:58:29 +0000 -Subject: [PATCH] * tools/tiff2bw.c: when Photometric=RGB, the utility only - works if SamplesPerPixel = 3. Enforce that - http://bugzilla.maptools.org/show_bug.cgi?id=2485 (CVE-2014-8127) - ---- - ChangeLog | 6 ++++++ - tools/tiff2bw.c | 5 +++++ - 2 files changed, 11 insertions(+) - -diff --git a/tools/tiff2bw.c b/tools/tiff2bw.c -index 22467cd..94b8e31 100644 ---- a/tools/tiff2bw.c -+++ b/tools/tiff2bw.c -@@ -171,6 +171,11 @@ main(int argc, char* argv[]) - argv[optind], samplesperpixel); - return (-1); - } -+ if( photometric == PHOTOMETRIC_RGB && samplesperpixel != 3) { -+ fprintf(stderr, "%s: Bad samples/pixel %u for PHOTOMETRIC_RGB.\n", -+ argv[optind], samplesperpixel); -+ return (-1); -+ } - TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bitspersample); - if (bitspersample != 8) { - fprintf(stderr, |