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

Assertions in LXWDecode and LZWDecodeCompat replaced by warnings. Now libtiff

Browse Source 
should read corrupted LZW-compressed files by skipping bad strips. Closes
http://bugzilla.remotesensing.org/show_bug.cgi?id=100
This commit is contained in:
Andrey Kiselev 2002-04-04 14:35:35 +00:00
parent 1fec47ce77
commit 3e540b2d38
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libtiff/tif_lzw.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_lzw.c,v 1.10 2002-04-03 20:18:16 warmerda Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_lzw.c,v 1.11 2002-04-04 14:35:35 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -396,7 +396,11 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize_t occ0, tsample_t s)
/* /*
* Add the new entry to the code table. * Add the new entry to the code table.
*/ */
assert(&sp->dec_codetab[0] <= free_entp && free_entp < &sp->dec_codetab[CSIZE]); if (&sp->dec_codetab[0] > free_entp || free_entp >= &sp->dec_codetab[CSIZE]) {
TIFFError(tif->tif_name, "LZWDecode: Unexpected end of code table");
return (0);
}
free_entp->next = oldcodep; free_entp->next = oldcodep;
free_entp->firstchar = free_entp->next->firstchar; free_entp->firstchar = free_entp->next->firstchar;
free_entp->length = free_entp->next->length+1; free_entp->length = free_entp->next->length+1;
@ -571,7 +575,11 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0, tsize_t occ0, tsample_t s)
/* /*
* Add the new entry to the code table. * Add the new entry to the code table.
*/ */
assert(&sp->dec_codetab[0] <= free_entp && free_entp < &sp->dec_codetab[CSIZE]); if (&sp->dec_codetab[0] > free_entp || free_entp >= &sp->dec_codetab[CSIZE]) {
TIFFError(tif->tif_name, "LZWDecode: Unexpected end of code table");
return (0);
}
free_entp->next = oldcodep; free_entp->next = oldcodep;
free_entp->firstchar = free_entp->next->firstchar; free_entp->firstchar = free_entp->next->firstchar;
free_entp->length = free_entp->next->length+1; free_entp->length = free_entp->next->length+1;