fixed memory overrun in packbits decode

This commit is contained in:
Frank Warmerdam 2001-09-06 19:28:45 +00:00
parent d15abe6676
commit e7bdb18949
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2001-09-06 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/tif_packbits.c: fixed memory overrun error.
http://bugzilla.remotesensing.org/show_bug.cgi?id=77
2001-08-31 Frank Warmerdam <warmerdam@pobox.com> 2001-08-31 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/tif_getimage.c: relax handling of contig case where * libtiff/tif_getimage.c: relax handling of contig case where

View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_packbits.c,v 1.4 2000-10-20 16:33:51 warmerda Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_packbits.c,v 1.5 2001-09-06 19:28:45 warmerda Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -244,6 +244,7 @@ PackBitsDecode(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
"PackBitsDecode: discarding %d bytes " "PackBitsDecode: discarding %d bytes "
"to avoid buffer overrun", "to avoid buffer overrun",
n - occ); n - occ);
n = occ;
} }
occ -= n; occ -= n;
b = *bp++, cc--; b = *bp++, cc--;