diff options
| -rw-r--r-- | graphics/tiff/distinfo | 4 | ||||
| -rw-r--r-- | graphics/tiff/patches/patch-av | 29 |
2 files changed, 20 insertions, 13 deletions
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo index d4720ce8086..791216f14ff 100644 --- a/graphics/tiff/distinfo +++ b/graphics/tiff/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.39 2006/08/02 15:42:25 salo Exp $ +$NetBSD: distinfo,v 1.40 2006/08/03 15:17:49 taca Exp $ SHA1 (tiff-3.8.2.tar.gz) = 549e67b6a15b42bfcd72fe17cda7c9a198a393eb RMD160 (tiff-3.8.2.tar.gz) = 1b4d825e3be08764e953fc58246d0c25ab4dd17d @@ -7,7 +7,7 @@ SHA1 (patch-aa) = edac79a6f3b61e9fc787fe14f750d88023a29bfa SHA1 (patch-ab) = b517cb8bc2212d3e6c5a70db1bdf45b85b78fc72 SHA1 (patch-at) = 4006ed90f6ab88aff30e2537d613a1b44b5c7347 SHA1 (patch-au) = c53ed7521c3918081526ad63cd0c1c45c9a0b9ff -SHA1 (patch-av) = e1b8cec32b9706af0074c2a54bdd1fd2ea2b8e36 +SHA1 (patch-av) = 38852ef5028f6c0ad7a3e5497248f264f0cb7366 SHA1 (patch-aw) = 8df07a9bc23092cfde2b364a1965efcfdc848b1e SHA1 (patch-ax) = 1a111d7a80bf98a650d147c035cd719d34aafc8a SHA1 (patch-ay) = db50f1d97b5d3b94e4d470b49642fe105977e0b7 diff --git a/graphics/tiff/patches/patch-av b/graphics/tiff/patches/patch-av index 3e70af3d269..3ddb3c59ff5 100644 --- a/graphics/tiff/patches/patch-av +++ b/graphics/tiff/patches/patch-av @@ -1,9 +1,9 @@ -$NetBSD: patch-av,v 1.5 2006/08/02 15:42:25 salo Exp $ +$NetBSD: patch-av,v 1.6 2006/08/03 15:17:49 taca Exp $ Security fix for SA21304. ---- libtiff/tif_dir.c.orig 2006-03-21 17:42:50.000000000 +0100 -+++ libtiff/tif_dir.c 2006-08-02 17:18:41.000000000 +0200 +--- libtiff/tif_dir.c.orig Wed Mar 22 01:42:50 2006 ++++ libtiff/tif_dir.c @@ -122,6 +122,7 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va { static const char module[] = "_TIFFVSetField"; @@ -12,11 +12,14 @@ Security fix for SA21304. TIFFDirectory* td = &tif->tif_dir; int status = 1; uint32 v32, i, v; -@@ -195,10 +196,12 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va +@@ -193,15 +194,18 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va + td->td_fillorder = (uint16) v; break; - case TIFFTAG_ORIENTATION: - v = va_arg(ap, uint32); + break; +- case TIFFTAG_ORIENTATION: ++ case TIFFTAG_ORIENTATION: { + const TIFFFieldInfo* fip; + v = va_arg(ap, uint32); if (v < ORIENTATION_TOPLEFT || ORIENTATION_LEFTBOT < v) { + fip = _TIFFFieldWithTag(tif, tag); TIFFWarningExt(tif->tif_clientdata, tif->tif_name, @@ -26,7 +29,11 @@ Security fix for SA21304. } else td->td_orientation = (uint16) v; break; -@@ -387,11 +390,15 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va ++ } + case TIFFTAG_SAMPLESPERPIXEL: + /* XXX should cross check -- e.g. if pallette, then 1 */ + v = va_arg(ap, uint32); +@@ -387,11 +391,15 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va * happens, for example, when tiffcp is used to convert between * compression schemes and codec-specific tags are blindly copied. */ @@ -43,7 +50,7 @@ Security fix for SA21304. status = 0; break; } -@@ -468,7 +475,7 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va +@@ -468,7 +476,7 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va if (fip->field_type == TIFF_ASCII) _TIFFsetString((char **)&tv->value, va_arg(ap, char *)); else { @@ -52,7 +59,7 @@ Security fix for SA21304. if (!tv->value) { status = 0; goto end; -@@ -563,7 +570,7 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va +@@ -563,7 +571,7 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va } } if (status) { @@ -61,7 +68,7 @@ Security fix for SA21304. tif->tif_flags |= TIFF_DIRTYDIRECT; } -@@ -572,12 +579,12 @@ end: +@@ -572,12 +580,12 @@ end: return (status); badvalue: TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad value %d for \"%s\"", @@ -76,7 +83,7 @@ Security fix for SA21304. va_end(ap); return (0); } -@@ -813,12 +820,16 @@ _TIFFVGetField(TIFF* tif, ttag_t tag, va +@@ -813,12 +821,16 @@ _TIFFVGetField(TIFF* tif, ttag_t tag, va * If the client tries to get a tag that is not valid * for the image's codec then we'll arrive here. */ |