cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* tools/thumbnail.c, tools/tiffcmp.c: only read/write TIFFTAG_GROUP3OPTIONS

Browse Source 
or TIFFTAG_GROUP4OPTIONS if compression is COMPRESSION_CCITTFAX3 or
COMPRESSION_CCITTFAX4
http://bugzilla.maptools.org/show_bug.cgi?id=2493 (CVE-2014-8128)
This commit is contained in:
Even Rouault 2014-12-21 18:52:42 +00:00
parent 7d3b9da6cb
commit 1246f97138
3 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2014-12-21 Even Rouault <even.rouault@spatialys.com>
* tools/thumbnail.c, tools/tiffcmp.c: only read/write TIFFTAG_GROUP3OPTIONS
or TIFFTAG_GROUP4OPTIONS if compression is COMPRESSION_CCITTFAX3 or
COMPRESSION_CCITTFAX4
http://bugzilla.maptools.org/show_bug.cgi?id=2493 (CVE-2014-8128)
2014-12-21 Even Rouault <even.rouault@spatialys.com> 2014-12-21 Even Rouault <even.rouault@spatialys.com>
* libtiff/tif_next.c: check that BitsPerSample = 2. Fixes * libtiff/tif_next.c: check that BitsPerSample = 2. Fixes

23
tools/thumbnail.c
View File

@ -1,4 +1,4 @@
/* $Id: thumbnail.c,v 1.17 2014-12-07 22:33:06 erouault Exp $ */ /* $Id: thumbnail.c,v 1.18 2014-12-21 18:52:42 erouault Exp $ */
/* /*
* Copyright (c) 1994-1997 Sam Leffler * Copyright (c) 1994-1997 Sam Leffler
@ -274,7 +274,26 @@ cpTags(TIFF* in, TIFF* out)
{ {
struct cpTag *p; struct cpTag *p;
for (p = tags; p < &tags[NTAGS]; p++) for (p = tags; p < &tags[NTAGS]; p++)
cpTag(in, out, p->tag, p->count, p->type); {
/* Horrible: but TIFFGetField() expects 2 arguments to be passed */
/* if we request a tag that is defined in a codec, but that codec */
/* isn't used */
if( p->tag == TIFFTAG_GROUP3OPTIONS )
{
uint16 compression;
if( !TIFFGetField(in, TIFFTAG_COMPRESSION, &compression) ||
compression != COMPRESSION_CCITTFAX3 )
continue;
}
if( p->tag == TIFFTAG_GROUP4OPTIONS )
{
uint16 compression;
if( !TIFFGetField(in, TIFFTAG_COMPRESSION, &compression) ||
compression != COMPRESSION_CCITTFAX4 )
continue;
}
cpTag(in, out, p->tag, p->count, p->type);
}
} }
#undef NTAGS #undef NTAGS

19
tools/tiffcmp.c
View File

@ -1,4 +1,4 @@
/* $Id: tiffcmp.c,v 1.16 2010-03-10 18:56:50 bfriesen Exp $ */ /* $Id: tiffcmp.c,v 1.17 2014-12-21 18:52:42 erouault Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -260,6 +260,7 @@ bad1:
static int static int
cmptags(TIFF* tif1, TIFF* tif2) cmptags(TIFF* tif1, TIFF* tif2)
{ {
uint16 compression1, compression2;
CmpLongField(TIFFTAG_SUBFILETYPE, "SubFileType"); CmpLongField(TIFFTAG_SUBFILETYPE, "SubFileType");
CmpLongField(TIFFTAG_IMAGEWIDTH, "ImageWidth"); CmpLongField(TIFFTAG_IMAGEWIDTH, "ImageWidth");
CmpLongField(TIFFTAG_IMAGELENGTH, "ImageLength"); CmpLongField(TIFFTAG_IMAGELENGTH, "ImageLength");
@ -276,8 +277,20 @@ cmptags(TIFF* tif1, TIFF* tif2)
CmpShortField(TIFFTAG_SAMPLEFORMAT, "SampleFormat"); CmpShortField(TIFFTAG_SAMPLEFORMAT, "SampleFormat");
CmpFloatField(TIFFTAG_XRESOLUTION, "XResolution"); CmpFloatField(TIFFTAG_XRESOLUTION, "XResolution");
CmpFloatField(TIFFTAG_YRESOLUTION, "YResolution"); CmpFloatField(TIFFTAG_YRESOLUTION, "YResolution");
CmpLongField(TIFFTAG_GROUP3OPTIONS, "Group3Options"); if( TIFFGetField(tif1, TIFFTAG_COMPRESSION, &compression1) &&
CmpLongField(TIFFTAG_GROUP4OPTIONS, "Group4Options"); compression1 == COMPRESSION_CCITTFAX3 &&
TIFFGetField(tif2, TIFFTAG_COMPRESSION, &compression2) &&
compression2 == COMPRESSION_CCITTFAX3 )
{
CmpLongField(TIFFTAG_GROUP3OPTIONS, "Group3Options");
}
if( TIFFGetField(tif1, TIFFTAG_COMPRESSION, &compression1) &&
compression1 == COMPRESSION_CCITTFAX4 &&
TIFFGetField(tif2, TIFFTAG_COMPRESSION, &compression2) &&
compression2 == COMPRESSION_CCITTFAX4 )
{
CmpLongField(TIFFTAG_GROUP4OPTIONS, "Group4Options");
}
CmpShortField(TIFFTAG_RESOLUTIONUNIT, "ResolutionUnit"); CmpShortField(TIFFTAG_RESOLUTIONUNIT, "ResolutionUnit");
CmpShortField(TIFFTAG_PLANARCONFIG, "PlanarConfiguration"); CmpShortField(TIFFTAG_PLANARCONFIG, "PlanarConfiguration");
CmpLongField(TIFFTAG_ROWSPERSTRIP, "RowsPerStrip"); CmpLongField(TIFFTAG_ROWSPERSTRIP, "RowsPerStrip");