* libtiff/tif_dirread.c (TIFFReadCustomDirectory): Apply patch

from Jay Berkenbilt for "Bug 1895 - logic error in tif_dirread.c:
segfault after setting tdir_tag = IGNORE".
http://bugzilla.maptools.org/show_bug.cgi?id=1895
This commit is contained in:
Bob Friesenhahn 2009-08-24 16:43:40 +00:00
parent d699d4fb3c
commit 4dd4bbeccb
2 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2009-08-24 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* libtiff/tif_dirread.c (TIFFReadCustomDirectory): Apply patch
from Jay Berkenbilt for "Bug 1895 - logic error in tif_dirread.c:
segfault after setting tdir_tag = IGNORE".
http://bugzilla.maptools.org/show_bug.cgi?id=1895
2009-08-23 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> 2009-08-23 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* test/Makefile.am, test/tiffcrop*.sh: Split previously existing * test/Makefile.am, test/tiffcrop*.sh: Split previously existing

View File

@ -1,4 +1,4 @@
/* $Id: tif_dirread.c,v 1.153 2009-02-09 14:29:08 fwarmerdam Exp $ */ /* $Id: tif_dirread.c,v 1.154 2009-08-24 16:43:40 bfriesen Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -4140,6 +4140,8 @@ TIFFReadCustomDirectory(TIFF* tif, toff_t diroff,
} }
switch (dp->tdir_tag) switch (dp->tdir_tag)
{ {
case IGNORE:
break;
case EXIFTAG_SUBJECTDISTANCE: case EXIFTAG_SUBJECTDISTANCE:
(void) TIFFFetchSubjectDistance(tif,dp); (void) TIFFFetchSubjectDistance(tif,dp);
break; break;