cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more improvements to error reporting in TIFFFetchDirectory

Browse Source
This commit is contained in:
Frank Warmerdam 2007-09-20 19:20:54 +00:00
parent 9f6ea3bef9
commit 08f2d19fab
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libtiff/tif_dirread.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_dirread.c,v 1.131 2007-09-20 16:34:23 fwarmerdam Exp $ */
/* $Id: tif_dirread.c,v 1.132 2007-09-20 19:20:54 fwarmerdam Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -3339,16 +3339,18 @@ TIFFReadDirectory(TIFF* tif)
uint16 di;
const TIFFField* fip;
uint32 fii;
toff_t nextdiroff;
tif->tif_diroff=tif->tif_nextdiroff;
if (!TIFFCheckDirOffset(tif,tif->tif_nextdiroff))
return 0; /* last offset or bad offset (IFD looping) */
(*tif->tif_cleanup)(tif); /* cleanup any previous compression state */
tif->tif_curdir++;
dircount=TIFFFetchDirectory(tif,tif->tif_nextdiroff,&dir,&tif->tif_nextdiroff);
nextdiroff = tif->tif_nextdiroff;
dircount=TIFFFetchDirectory(tif,nextdiroff,&dir,&tif->tif_nextdiroff);
if (!dircount)
{
TIFFErrorExt(tif->tif_clientdata,module,
"Failed to read directory at offset %llu",tif->tif_nextdiroff);
"Failed to read directory at offset %llu",nextdiroff);
return 0;
}
TIFFReadDirectoryCheckOrder(tif,dir,dircount);