diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2009-02-05 19:50:01 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2009-02-05 19:50:01 +0000 |
| commit | 4d658090bbb7770c480f50c1a1a9247c931ea5cc (patch) | |
| tree | 6f2ad7d2d1c3c43112bf6f1896b4b1e952437599 | |
| parent | 06ed150673df73a1cdd16c4d980f4ec1438d341c (diff) | |
| download | libtiff-git-4d658090bbb7770c480f50c1a1a9247c931ea5cc.tar.gz | |
removed another assertion that fires on corrupt files
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | libtiff/tif_dirread.c | 3 |
2 files changed, 2 insertions, 2 deletions
@@ -4,6 +4,7 @@ corrupt files rather than in response to library internal inconsistencies. http://bugzilla.maptools.org/show_bug.cgi?id=1995 + http://bugzilla.maptools.org/show_bug.cgi?id=1991 * libtiff/tif_dirread.c: Fixed testing for failed result from TIFFReadDirectoryFindFieldInfo(). diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c index c3448264..d8823579 100644 --- a/libtiff/tif_dirread.c +++ b/libtiff/tif_dirread.c @@ -1,4 +1,4 @@ -/* $Id: tif_dirread.c,v 1.150 2009-02-05 19:21:45 fwarmerdam Exp $ */ +/* $Id: tif_dirread.c,v 1.151 2009-02-05 19:50:01 fwarmerdam Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -4581,7 +4581,6 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEntry* dp, int recover) uint32 fii; const TIFFField* fip; TIFFReadDirectoryFindFieldInfo(tif,dp->tdir_tag,&fii); - assert(fii != FAILED_FII); if( fii == FAILED_FII ) { TIFFErrorExt(tif->tif_clientdata, "TIFFFetchNormalTag", |