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

* tools/tiffcp.c: fix uint32 underflow/overflow that can cause heap-based

Browse Source 
buffer overflow.
Reported by Agostino Sarubbo.
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2610
This commit is contained in:
Even Rouault 2016-12-03 16:40:01 +00:00
parent b1e5ae5984
commit bae8284136
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2016-12-03 Even Rouault <even.rouault at spatialys.com>
* tools/tiffcp.c: fix uint32 underflow/overflow that can cause heap-based
buffer overflow.
Reported by Agostino Sarubbo.
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2610
2016-12-03 Even Rouault <even.rouault at spatialys.com> 2016-12-03 Even Rouault <even.rouault at spatialys.com>
* tools/tiffcp.c: avoid potential division by zero is BitsPerSamples tag is * tools/tiffcp.c: avoid potential division by zero is BitsPerSamples tag is

8
tools/tiffcp.c
View File

@ -1,4 +1,4 @@
/* $Id: tiffcp.c,v 1.58 2016-12-03 15:44:15 erouault Exp $ */ /* $Id: tiffcp.c,v 1.59 2016-12-03 16:40:01 erouault Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -1163,7 +1163,7 @@ bad:
static void static void
cpStripToTile(uint8* out, uint8* in, cpStripToTile(uint8* out, uint8* in,
uint32 rows, uint32 cols, int outskew, int inskew) uint32 rows, uint32 cols, int outskew, int64 inskew)
{ {
while (rows-- > 0) { while (rows-- > 0) {
uint32 j = cols; uint32 j = cols;
@ -1320,7 +1320,7 @@ DECLAREreadFunc(readContigTilesIntoBuffer)
tdata_t tilebuf; tdata_t tilebuf;
uint32 imagew = TIFFScanlineSize(in); uint32 imagew = TIFFScanlineSize(in);
uint32 tilew = TIFFTileRowSize(in); uint32 tilew = TIFFTileRowSize(in);
int iskew = imagew - tilew; int64 iskew = (int64)imagew - (int64)tilew;
uint8* bufp = (uint8*) buf; uint8* bufp = (uint8*) buf;
uint32 tw, tl; uint32 tw, tl;
uint32 row; uint32 row;
@ -1348,7 +1348,7 @@ DECLAREreadFunc(readContigTilesIntoBuffer)
status = 0; status = 0;
goto done; goto done;
} }
if (colb + tilew > imagew) { if (colb > iskew) {
uint32 width = imagew - colb; uint32 width = imagew - colb;
uint32 oskew = tilew - width; uint32 oskew = tilew - width;
cpStripToTile(bufp + colb, cpStripToTile(bufp + colb,