|
|
- commit 6d3ef98b2415b2edfa36a5ba600d5a824c094309
- Author: erouault <erouault>
- Date: Sat Dec 3 14:42:40 2016 +0000
-
- * tools/tiffcp.c: avoid potential division by zero if BitsPerSamples tag is
- missing.
- Reported by Agostino Sarubbo.
- Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2597
-
- diff --git a/ChangeLog b/ChangeLog
- index e41d00c..0d7b12d 100644
- --- a/ChangeLog
- +++ b/ChangeLog
- @@ -1,5 +1,12 @@
- 2016-12-03 Even Rouault <even.rouault at spatialys.com>
-
- + * tools/tiffcp.c: avoid potential division by zero if BitsPerSamples tag is
- + missing.
- + Reported by Agostino Sarubbo.
- + Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2597
- +
- +2016-12-03 Even Rouault <even.rouault at spatialys.com>
- +
- * tools/tiffinfo.c: fix null pointer dereference in -r mode when the image has
- no StripByteCount tag.
- Reported by Agostino Sarubbo.
- diff --git a/tools/tiffcp.c b/tools/tiffcp.c
- index 6dfb9a9..c8e48c3 100644
- --- a/tools/tiffcp.c
- +++ b/tools/tiffcp.c
- @@ -1,4 +1,4 @@
- -/* $Id: tiffcp.c,v 1.56 2016-12-02 22:13:32 erouault Exp $ */
- +/* $Id: tiffcp.c,v 1.57 2016-12-03 14:42:40 erouault Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
- @@ -1378,7 +1378,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
- uint8* bufp = (uint8*) buf;
- uint32 tw, tl;
- uint32 row;
- - uint16 bps, bytes_per_sample;
- + uint16 bps = 0, bytes_per_sample;
-
- tilebuf = _TIFFmalloc(tilesize);
- if (tilebuf == 0)
- @@ -1387,6 +1387,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
- (void) TIFFGetField(in, TIFFTAG_TILEWIDTH, &tw);
- (void) TIFFGetField(in, TIFFTAG_TILELENGTH, &tl);
- (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps);
- + if( bps == 0 )
- + {
- + TIFFError(TIFFFileName(in), "Error, cannot read BitsPerSample");
- + status = 0;
- + goto done;
- + }
- assert( bps % 8 == 0 );
- bytes_per_sample = bps/8;
-
|
