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

* tools/gif2tiff.c: fix buffer overrun

Browse Source 
http://bugzilla.maptools.org/show_bug.cgi?id=2270
This commit is contained in:
Lee Howard 2010-12-15 00:22:44 +00:00
parent 7a01aa5d24
commit cb405082bb
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,4 +1,9 @@
2010-12-13 Lee Howard <faxguy@howardsilvan.com> 2010-12-14 Lee Howard <faxguy@howardsilvan.com>
* tools/gif2tiff.c: fix buffer overrun
http://bugzilla.maptools.org/show_bug.cgi?id=2270
2010-12-14 Lee Howard <faxguy@howardsilvan.com>
* libtiff/tif_jpeg.c: reduce usage of JCS_UNKNOWN in order * libtiff/tif_jpeg.c: reduce usage of JCS_UNKNOWN in order
to improve compatibility with various viewers to improve compatibility with various viewers

6
tools/gif2tiff.c
View File

@ -1,4 +1,4 @@
/* $Id: gif2tiff.c,v 1.11 2010-03-10 18:56:49 bfriesen Exp $ */ /* $Id: gif2tiff.c,v 1.12 2010-12-15 00:22:44 faxguy Exp $ */
/* /*
* Copyright (c) 1990-1997 Sam Leffler * Copyright (c) 1990-1997 Sam Leffler
@ -507,6 +507,10 @@ rasterize(int interleaved, char* mode)
strip = 0; strip = 0;
stripsize = TIFFStripSize(tif); stripsize = TIFFStripSize(tif);
for (row=0; row<height; row += rowsperstrip) { for (row=0; row<height; row += rowsperstrip) {
if (rowsperstrip > height-row) {
rowsperstrip = height-row;
stripsize = TIFFVStripSize(tif, rowsperstrip);
}
if (TIFFWriteEncodedStrip(tif, strip, newras+row*width, stripsize) < 0) if (TIFFWriteEncodedStrip(tif, strip, newras+row*width, stripsize) < 0)
break; break;
strip++; strip++;