31 lines
966 B
Diff
31 lines
966 B
Diff
|
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,
|