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

tif_dirread.c: Fixed problem with bogus file triggering assert in ChopUpSingleUncompressedStrip

Browse Source
This commit is contained in:
Joris Van Damme 2007-10-24 10:19:42 +00:00
parent 7497b6e5f3
commit 1a5dfd2205
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-10-24 Joris Van Damme <joris.at.lebbeke@skynet.be>
* tif_dirread.c: Fixed problem with bogus file triggering
assert(td->td_planarconfig == PLANARCONFIG_CONTIG) in
ChopUpSingleUncompressedStrip
2007-10-22 Joris Van Damme <joris.at.lebbeke@skynet.be> 2007-10-22 Joris Van Damme <joris.at.lebbeke@skynet.be>
* tif_jpeg.c: Resolved buffer incrementation bug that lead to faulty images * tif_jpeg.c: Resolved buffer incrementation bug that lead to faulty images

8
libtiff/tif_dirread.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_dirread.c,v 1.134 2007-09-29 10:34:38 joris Exp $ */ /* $Id: tif_dirread.c,v 1.135 2007-10-24 10:20:23 joris Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -3868,8 +3868,10 @@ TIFFReadDirectory(TIFF* tif)
* side effect, however, is that the RowsPerStrip tag * side effect, however, is that the RowsPerStrip tag
* value may be changed. * value may be changed.
*/ */
if (tif->tif_dir.td_nstrips == 1 && tif->tif_dir.td_compression == COMPRESSION_NONE && if ((tif->tif_dir.td_planarconfig==PLANARCONFIG_CONTIG)&&
(tif->tif_flags & (TIFF_STRIPCHOP|TIFF_ISTILED)) == TIFF_STRIPCHOP) (tif->tif_dir.td_nstrips==1)&&
(tif->tif_dir.td_compression==COMPRESSION_NONE)&&
((tif->tif_flags&(TIFF_STRIPCHOP|TIFF_ISTILED))==TIFF_STRIPCHOP))
ChopUpSingleUncompressedStrip(tif); ChopUpSingleUncompressedStrip(tif);
/* /*