Merge pull request #4853 from StevenHessing/noddos
[feed/packages.git] / libs / tiff / patches / 010-CVE-2015-7554.patch
1 diff -pur tiff-4.0.4/tools/tiffsplit.c tiff-4.0.4_patch/tools/tiffsplit.c
2 --- tiff-4.0.4/tools/tiffsplit.c 2015-05-28 15:10:26.000000000 +0200
3 +++ tiff-4.0.4_patch/tools/tiffsplit.c 2016-02-12 19:15:30.532005041 +0100
4 @@ -179,8 +179,9 @@ tiffcp(TIFF* in, TIFF* out)
5 TIFFSetField(out, TIFFTAG_JPEGTABLES, count, table);
6 }
7 }
8 + uint32 count = 0;
9 CopyField(TIFFTAG_PHOTOMETRIC, shortv);
10 - CopyField(TIFFTAG_PREDICTOR, shortv);
11 + CopyField2(TIFFTAG_PREDICTOR, count, shortv);
12 CopyField(TIFFTAG_THRESHHOLDING, shortv);
13 CopyField(TIFFTAG_FILLORDER, shortv);
14 CopyField(TIFFTAG_ORIENTATION, shortv);
15 @@ -188,7 +189,7 @@ tiffcp(TIFF* in, TIFF* out)
16 CopyField(TIFFTAG_MAXSAMPLEVALUE, shortv);
17 CopyField(TIFFTAG_XRESOLUTION, floatv);
18 CopyField(TIFFTAG_YRESOLUTION, floatv);
19 - CopyField(TIFFTAG_GROUP3OPTIONS, longv);
20 + CopyField2(TIFFTAG_GROUP3OPTIONS, count, longv);
21 CopyField(TIFFTAG_GROUP4OPTIONS, longv);
22 CopyField(TIFFTAG_RESOLUTIONUNIT, shortv);
23 CopyField(TIFFTAG_PLANARCONFIG, shortv);