← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tools/tiffcmp.c

  • 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:
tools/tiffcmp.c
256
256
static int
257
257
cmptags(TIFF* tif1, TIFF* tif2)
258
258
{
 
259
        uint16 compression1, compression2;
259
260
        CmpLongField(TIFFTAG_SUBFILETYPE,       "SubFileType");
260
261
        CmpLongField(TIFFTAG_IMAGEWIDTH,        "ImageWidth");
261
262
        CmpLongField(TIFFTAG_IMAGELENGTH,       "ImageLength");
272
273
        CmpShortField(TIFFTAG_SAMPLEFORMAT,     "SampleFormat");
273
274
        CmpFloatField(TIFFTAG_XRESOLUTION,      "XResolution");
274
275
        CmpFloatField(TIFFTAG_YRESOLUTION,      "YResolution");
275
 
        CmpLongField(TIFFTAG_GROUP3OPTIONS,     "Group3Options");
276
 
        CmpLongField(TIFFTAG_GROUP4OPTIONS,     "Group4Options");
 
276
        if( TIFFGetField(tif1, TIFFTAG_COMPRESSION, &compression1) &&
 
277
                compression1 == COMPRESSION_CCITTFAX3 &&
 
278
                TIFFGetField(tif2, TIFFTAG_COMPRESSION, &compression2) &&
 
279
                compression2 == COMPRESSION_CCITTFAX3 )
 
280
        {
 
281
                CmpLongField(TIFFTAG_GROUP3OPTIONS,     "Group3Options");
 
282
        }
 
283
        if( TIFFGetField(tif1, TIFFTAG_COMPRESSION, &compression1) &&
 
284
                compression1 == COMPRESSION_CCITTFAX4 &&
 
285
                TIFFGetField(tif2, TIFFTAG_COMPRESSION, &compression2) &&
 
286
                compression2 == COMPRESSION_CCITTFAX4 )
 
287
        {
 
288
                CmpLongField(TIFFTAG_GROUP4OPTIONS,     "Group4Options");
 
289
        }
277
290
        CmpShortField(TIFFTAG_RESOLUTIONUNIT,   "ResolutionUnit");
278
291
        CmpShortField(TIFFTAG_PLANARCONFIG,     "PlanarConfiguration");
279
292
        CmpLongField(TIFFTAG_ROWSPERSTRIP,      "RowsPerStrip");