diff options
Diffstat (limited to 'graphics/tiff/patches/patch-aa')
| -rw-r--r-- | graphics/tiff/patches/patch-aa | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/graphics/tiff/patches/patch-aa b/graphics/tiff/patches/patch-aa deleted file mode 100644 index 52c8cf04fda..00000000000 --- a/graphics/tiff/patches/patch-aa +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-aa,v 1.19 2010/08/04 17:48:22 tron Exp $ - -Fix for CVE-2010-2233 taken from here ... - -http://bugzilla.maptools.org/show_bug.cgi?id=2207 - -... and for CVE-2010-2483 taken from here: - -https://bugzilla.redhat.com/show_bug.cgi?id=603081 - ---- libtiff/tif_getimage.c.orig 2010-06-08 19:50:42.000000000 +0100 -+++ libtiff/tif_getimage.c 2010-08-04 18:20:24.000000000 +0100 -@@ -1846,6 +1846,7 @@ - DECLAREContigPutFunc(putcontig8bitYCbCr22tile) - { - uint32* cp2; -+ int32 incr = 2*toskew+w; - (void) y; - fromskew = (fromskew / 2) * 6; - cp2 = cp+w+toskew; -@@ -1872,8 +1873,8 @@ - cp2 ++ ; - pp += 6; - } -- cp += toskew*2+w; -- cp2 += toskew*2+w; -+ cp += incr; -+ cp2 += incr; - pp += fromskew; - h-=2; - } -@@ -1939,6 +1940,7 @@ - DECLAREContigPutFunc(putcontig8bitYCbCr12tile) - { - uint32* cp2; -+ int32 incr = 2*toskew+w; - (void) y; - fromskew = (fromskew / 2) * 4; - cp2 = cp+w+toskew; -@@ -1953,8 +1955,8 @@ - cp2 ++; - pp += 4; - } while (--x); -- cp += toskew*2+w; -- cp2 += toskew*2+w; -+ cp += incr; -+ cp2 += incr; - pp += fromskew; - h-=2; - } -@@ -2397,7 +2399,7 @@ - } - break; - case PHOTOMETRIC_YCBCR: -- if (img->bitspersample == 8) -+ if ((img->bitspersample==8) && (img->samplesperpixel==3)) - { - if (initYCbCrConversion(img)!=0) - { |