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

Check field counter against number of field in order to fix

Browse Source 
http://bugzilla.remotesensing.org/show_bug.cgi?id=366
This commit is contained in:
Andrey Kiselev 2003-09-30 09:38:55 +00:00
parent 5bc9b3883e
commit 677626c90e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libtiff/tif_dirread.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dirread.c,v 1.23 2003-09-25 08:36:21 dron Exp $ */
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dirread.c,v 1.24 2003-09-30 09:38:55 dron Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -248,9 +248,9 @@ TIFFReadDirectory(TIFF* tif)
if( TIFFReassignTagToIgnore(TIS_EXTRACT, dp->tdir_tag) )
dp->tdir_tag = IGNORE;
if (dp->tdir_tag == IGNORE)
continue;
if (fix >= tif->tif_nfields || dp->tdir_tag == IGNORE)
continue;
/*
* Silicon Beach (at least) writes unordered
* directory tags (violating the spec). Handle
@ -266,9 +266,9 @@ TIFFReadDirectory(TIFF* tif)
fix = 0; /* O(n^2) */
}
while (fix < tif->tif_nfields &&
tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
fix++;
if (fix == tif->tif_nfields ||
if (fix >= tif->tif_nfields ||
tif->tif_fieldinfo[fix]->field_tag != dp->tdir_tag) {
TIFFWarning(module,
@ -305,7 +305,8 @@ TIFFReadDirectory(TIFF* tif)
fip->field_tag != dp->tdir_tag) {
TIFFWarning(module,
"%.1000s: wrong data type %d for \"%s\"; tag ignored",
tif->tif_name, dp->tdir_type, fip[-1].field_name);
tif->tif_name, dp->tdir_type,
fip[-1].field_name);
goto ignore;
}
}