diff options
| author |   Michael Vetter <jubalh@iodoru.org> | 2018-02-16 15:04:47 +0000 |
|---|---|---|
| committer |   Lars Wendler <polynomial-c@gentoo.org> | 2018-02-16 16:21:33 +0100 |
| commit | 88961c859ba1efbe6e3555246444dc0456bddcb8 (patch) | |
| tree | f3b056c7825b0b49ef0ba1a2daf5407d3b1c6331 /media-libs/tiff/files | |
| parent | app-emulation/virtualbox: Some ebuild improvements. (diff) | |
| download | gentoo-88961c859ba1efbe6e3555246444dc0456bddcb8.tar.gz gentoo-88961c859ba1efbe6e3555246444dc0456bddcb8.tar.bz2 gentoo-88961c859ba1efbe6e3555246444dc0456bddcb8.zip | |
media-libs/tiff: Patch to fix type (CVE-2017-9935)
CVE-2017-9935 has a second commit with ID
d4f213636b6f950498a1386083199bd7f65676b9 to fix the type of the table.
Bug: https://bugs.gentoo.org/624696
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7204
Diffstat (limited to 'media-libs/tiff/files')
| -rw-r--r-- | media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935-fix-incorrect-type.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935-fix-incorrect-type.patch b/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935-fix-incorrect-type.patch new file mode 100644 index 000000000000..101618ee7d57 --- /dev/null +++ b/media-libs/tiff/files/tiff-4.0.9-CVE-2017-9935-fix-incorrect-type.patch @@ -0,0 +1,58 @@ +From d4f213636b6f950498a1386083199bd7f65676b9 Mon Sep 17 00:00:00 2001 +From: Brian May <brian@linuxpenguins.xyz> +Date: Thu, 7 Dec 2017 07:49:20 +1100 +Subject: [PATCH] tiff2pdf: Fix apparent incorrect type for transfer table + +The standard says the transfer table contains unsigned 16 bit values, +I have no idea why we refer to them as floats. +--- + tools/tiff2pdf.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c +index c3ec074..484776c 100644 +--- a/tools/tiff2pdf.c ++++ b/tools/tiff2pdf.c +@@ -237,7 +237,7 @@ typedef struct { + float tiff_whitechromaticities[2]; + float tiff_primarychromaticities[6]; + float tiff_referenceblackwhite[2]; +- float* tiff_transferfunction[3]; ++ uint16* tiff_transferfunction[3]; + int pdf_image_interpolate; /* 0 (default) : do not interpolate, + 1 : interpolate */ + uint16 tiff_transferfunctioncount; +@@ -1048,7 +1048,7 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){ + uint16 paged=0; + uint16 xuint16=0; + uint16 tiff_transferfunctioncount=0; +- float* tiff_transferfunction[3]; ++ uint16* tiff_transferfunction[3]; + + directorycount=TIFFNumberOfDirectories(input); + t2p->tiff_pages = (T2P_PAGE*) _TIFFmalloc(TIFFSafeMultiply(tmsize_t,directorycount,sizeof(T2P_PAGE))); +@@ -1153,8 +1153,8 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){ + &(tiff_transferfunction[1]), + &(tiff_transferfunction[2]))) { + +- if((tiff_transferfunction[1] != (float*) NULL) && +- (tiff_transferfunction[2] != (float*) NULL) ++ if((tiff_transferfunction[1] != (uint16*) NULL) && ++ (tiff_transferfunction[2] != (uint16*) NULL) + ) { + tiff_transferfunctioncount=3; + } else { +@@ -1851,8 +1851,8 @@ void t2p_read_tiff_data(T2P* t2p, TIFF* input){ + &(t2p->tiff_transferfunction[0]), + &(t2p->tiff_transferfunction[1]), + &(t2p->tiff_transferfunction[2]))) { +- if((t2p->tiff_transferfunction[1] != (float*) NULL) && +- (t2p->tiff_transferfunction[2] != (float*) NULL) ++ if((t2p->tiff_transferfunction[1] != (uint16*) NULL) && ++ (t2p->tiff_transferfunction[2] != (uint16*) NULL) + ) { + t2p->tiff_transferfunctioncount=3; + } else { +-- +libgit2 0.26.0 + |