Signed-off-by: Jiri Slachta <jiri@slachta.eu>lilik-openwrt-22.03
@ -1,136 +0,0 @@ | |||
From f3f0cad770593eaef0766e5be896a6a034fc6313 Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Sat, 26 Dec 2015 17:32:03 +0000 | |||
Subject: [PATCH] * libtiff/tif_getimage.c: fix out-of-bound reads in | |||
TIFFRGBAImage interface in case of unsupported values of | |||
SamplesPerPixel/ExtraSamples for LogLUV / CIELab. Add explicit call to | |||
TIFFRGBAImageOK() in TIFFRGBAImageBegin(). Fix CVE-2015-8665 reported by | |||
limingxing and CVE-2015-8683 reported by zzf of Alibaba. | |||
--- | |||
ChangeLog | 8 ++++++++ | |||
libtiff/tif_getimage.c | 37 +++++++++++++++++++++++-------------- | |||
2 files changed, 31 insertions(+), 14 deletions(-) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index a7d283a..4beb30b 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,3 +1,11 @@ | |||
+2015-12-26 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
+ * libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage | |||
+ interface in case of unsupported values of SamplesPerPixel/ExtraSamples | |||
+ for LogLUV / CIELab. Add explicit call to TIFFRGBAImageOK() in | |||
+ TIFFRGBAImageBegin(). Fix CVE-2015-8665 reported by limingxing and | |||
+ CVE-2015-8683 reported by zzf of Alibaba. | |||
+ | |||
2015-09-12 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | |||
* libtiff 4.0.6 released. | |||
diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c | |||
index fd0a4f9..fae1e31 100644 | |||
--- a/libtiff/tif_getimage.c | |||
+++ b/libtiff/tif_getimage.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tif_getimage.c,v 1.90 2015-06-17 01:34:08 bfriesen Exp $ */ | |||
+/* $Id: tif_getimage.c,v 1.94 2015-12-26 17:32:03 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1991-1997 Sam Leffler | |||
@@ -182,20 +182,22 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024]) | |||
"Planarconfiguration", td->td_planarconfig); | |||
return (0); | |||
} | |||
- if( td->td_samplesperpixel != 3 ) | |||
+ if( td->td_samplesperpixel != 3 || colorchannels != 3 ) | |||
{ | |||
sprintf(emsg, | |||
- "Sorry, can not handle image with %s=%d", | |||
- "Samples/pixel", td->td_samplesperpixel); | |||
+ "Sorry, can not handle image with %s=%d, %s=%d", | |||
+ "Samples/pixel", td->td_samplesperpixel, | |||
+ "colorchannels", colorchannels); | |||
return 0; | |||
} | |||
break; | |||
case PHOTOMETRIC_CIELAB: | |||
- if( td->td_samplesperpixel != 3 || td->td_bitspersample != 8 ) | |||
+ if( td->td_samplesperpixel != 3 || colorchannels != 3 || td->td_bitspersample != 8 ) | |||
{ | |||
sprintf(emsg, | |||
- "Sorry, can not handle image with %s=%d and %s=%d", | |||
+ "Sorry, can not handle image with %s=%d, %s=%d and %s=%d", | |||
"Samples/pixel", td->td_samplesperpixel, | |||
+ "colorchannels", colorchannels, | |||
"Bits/sample", td->td_bitspersample); | |||
return 0; | |||
} | |||
@@ -255,6 +257,9 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024]) | |||
int colorchannels; | |||
uint16 *red_orig, *green_orig, *blue_orig; | |||
int n_color; | |||
+ | |||
+ if( !TIFFRGBAImageOK(tif, emsg) ) | |||
+ return 0; | |||
/* Initialize to normal values */ | |||
img->row_offset = 0; | |||
@@ -2508,29 +2513,33 @@ PickContigCase(TIFFRGBAImage* img) | |||
case PHOTOMETRIC_RGB: | |||
switch (img->bitspersample) { | |||
case 8: | |||
- if (img->alpha == EXTRASAMPLE_ASSOCALPHA) | |||
+ if (img->alpha == EXTRASAMPLE_ASSOCALPHA && | |||
+ img->samplesperpixel >= 4) | |||
img->put.contig = putRGBAAcontig8bittile; | |||
- else if (img->alpha == EXTRASAMPLE_UNASSALPHA) | |||
+ else if (img->alpha == EXTRASAMPLE_UNASSALPHA && | |||
+ img->samplesperpixel >= 4) | |||
{ | |||
if (BuildMapUaToAa(img)) | |||
img->put.contig = putRGBUAcontig8bittile; | |||
} | |||
- else | |||
+ else if( img->samplesperpixel >= 3 ) | |||
img->put.contig = putRGBcontig8bittile; | |||
break; | |||
case 16: | |||
- if (img->alpha == EXTRASAMPLE_ASSOCALPHA) | |||
+ if (img->alpha == EXTRASAMPLE_ASSOCALPHA && | |||
+ img->samplesperpixel >=4 ) | |||
{ | |||
if (BuildMapBitdepth16To8(img)) | |||
img->put.contig = putRGBAAcontig16bittile; | |||
} | |||
- else if (img->alpha == EXTRASAMPLE_UNASSALPHA) | |||
+ else if (img->alpha == EXTRASAMPLE_UNASSALPHA && | |||
+ img->samplesperpixel >=4 ) | |||
{ | |||
if (BuildMapBitdepth16To8(img) && | |||
BuildMapUaToAa(img)) | |||
img->put.contig = putRGBUAcontig16bittile; | |||
} | |||
- else | |||
+ else if( img->samplesperpixel >=3 ) | |||
{ | |||
if (BuildMapBitdepth16To8(img)) | |||
img->put.contig = putRGBcontig16bittile; | |||
@@ -2539,7 +2548,7 @@ PickContigCase(TIFFRGBAImage* img) | |||
} | |||
break; | |||
case PHOTOMETRIC_SEPARATED: | |||
- if (buildMap(img)) { | |||
+ if (img->samplesperpixel >=4 && buildMap(img)) { | |||
if (img->bitspersample == 8) { | |||
if (!img->Map) | |||
img->put.contig = putRGBcontig8bitCMYKtile; | |||
@@ -2635,7 +2644,7 @@ PickContigCase(TIFFRGBAImage* img) | |||
} | |||
break; | |||
case PHOTOMETRIC_CIELAB: | |||
- if (buildMap(img)) { | |||
+ if (img->samplesperpixel == 3 && buildMap(img)) { | |||
if (img->bitspersample == 8) | |||
img->put.contig = initCIELabConversion(img); | |||
break; |
@ -1,193 +0,0 @@ | |||
From 3899f0ab62dd307f63f87ec99aaf289e104f4070 Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Sun, 27 Dec 2015 16:25:11 +0000 | |||
Subject: [PATCH] * libtiff/tif_luv.c: fix potential out-of-bound writes in | |||
decode functions in non debug builds by replacing assert()s by regular if | |||
checks (bugzilla #2522). Fix potential out-of-bound reads in case of short | |||
input data. | |||
--- | |||
ChangeLog | 7 +++++++ | |||
libtiff/tif_luv.c | 57 +++++++++++++++++++++++++++++++++++++++++++------------ | |||
2 files changed, 52 insertions(+), 12 deletions(-) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 4beb30b..b8aa23c 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,3 +1,10 @@ | |||
+2015-12-27 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
+ * libtiff/tif_luv.c: fix potential out-of-bound writes in decode | |||
+ functions in non debug builds by replacing assert()s by regular if | |||
+ checks (bugzilla #2522). | |||
+ Fix potential out-of-bound reads in case of short input data. | |||
+ | |||
2015-12-26 Even Rouault <even.rouault at spatialys.com> | |||
* libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage | |||
diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c | |||
index 4e328ba..60a174d 100644 | |||
--- a/libtiff/tif_luv.c | |||
+++ b/libtiff/tif_luv.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tif_luv.c,v 1.40 2015-06-21 01:09:09 bfriesen Exp $ */ | |||
+/* $Id: tif_luv.c,v 1.41 2015-12-27 16:25:11 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1997 Greg Ward Larson | |||
@@ -202,7 +202,11 @@ LogL16Decode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) | |||
if (sp->user_datafmt == SGILOGDATAFMT_16BIT) | |||
tp = (int16*) op; | |||
else { | |||
- assert(sp->tbuflen >= npixels); | |||
+ if(sp->tbuflen < npixels) { | |||
+ TIFFErrorExt(tif->tif_clientdata, module, | |||
+ "Translation buffer too short"); | |||
+ return (0); | |||
+ } | |||
tp = (int16*) sp->tbuf; | |||
} | |||
_TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0])); | |||
@@ -211,9 +215,11 @@ LogL16Decode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) | |||
cc = tif->tif_rawcc; | |||
/* get each byte string */ | |||
for (shft = 2*8; (shft -= 8) >= 0; ) { | |||
- for (i = 0; i < npixels && cc > 0; ) | |||
+ for (i = 0; i < npixels && cc > 0; ) { | |||
if (*bp >= 128) { /* run */ | |||
- rc = *bp++ + (2-128); /* TODO: potential input buffer overrun when decoding corrupt or truncated data */ | |||
+ if( cc < 2 ) | |||
+ break; | |||
+ rc = *bp++ + (2-128); | |||
b = (int16)(*bp++ << shft); | |||
cc -= 2; | |||
while (rc-- && i < npixels) | |||
@@ -223,6 +229,7 @@ LogL16Decode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) | |||
while (--cc && rc-- && i < npixels) | |||
tp[i++] |= (int16)*bp++ << shft; | |||
} | |||
+ } | |||
if (i != npixels) { | |||
#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) | |||
TIFFErrorExt(tif->tif_clientdata, module, | |||
@@ -268,13 +275,17 @@ LogLuvDecode24(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) | |||
if (sp->user_datafmt == SGILOGDATAFMT_RAW) | |||
tp = (uint32 *)op; | |||
else { | |||
- assert(sp->tbuflen >= npixels); | |||
+ if(sp->tbuflen < npixels) { | |||
+ TIFFErrorExt(tif->tif_clientdata, module, | |||
+ "Translation buffer too short"); | |||
+ return (0); | |||
+ } | |||
tp = (uint32 *) sp->tbuf; | |||
} | |||
/* copy to array of uint32 */ | |||
bp = (unsigned char*) tif->tif_rawcp; | |||
cc = tif->tif_rawcc; | |||
- for (i = 0; i < npixels && cc > 0; i++) { | |||
+ for (i = 0; i < npixels && cc >= 3; i++) { | |||
tp[i] = bp[0] << 16 | bp[1] << 8 | bp[2]; | |||
bp += 3; | |||
cc -= 3; | |||
@@ -325,7 +336,11 @@ LogLuvDecode32(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) | |||
if (sp->user_datafmt == SGILOGDATAFMT_RAW) | |||
tp = (uint32*) op; | |||
else { | |||
- assert(sp->tbuflen >= npixels); | |||
+ if(sp->tbuflen < npixels) { | |||
+ TIFFErrorExt(tif->tif_clientdata, module, | |||
+ "Translation buffer too short"); | |||
+ return (0); | |||
+ } | |||
tp = (uint32*) sp->tbuf; | |||
} | |||
_TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0])); | |||
@@ -334,11 +349,13 @@ LogLuvDecode32(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) | |||
cc = tif->tif_rawcc; | |||
/* get each byte string */ | |||
for (shft = 4*8; (shft -= 8) >= 0; ) { | |||
- for (i = 0; i < npixels && cc > 0; ) | |||
+ for (i = 0; i < npixels && cc > 0; ) { | |||
if (*bp >= 128) { /* run */ | |||
+ if( cc < 2 ) | |||
+ break; | |||
rc = *bp++ + (2-128); | |||
b = (uint32)*bp++ << shft; | |||
- cc -= 2; /* TODO: potential input buffer overrun when decoding corrupt or truncated data */ | |||
+ cc -= 2; | |||
while (rc-- && i < npixels) | |||
tp[i++] |= b; | |||
} else { /* non-run */ | |||
@@ -346,6 +363,7 @@ LogLuvDecode32(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) | |||
while (--cc && rc-- && i < npixels) | |||
tp[i++] |= (uint32)*bp++ << shft; | |||
} | |||
+ } | |||
if (i != npixels) { | |||
#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) | |||
TIFFErrorExt(tif->tif_clientdata, module, | |||
@@ -413,6 +431,7 @@ LogLuvDecodeTile(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) | |||
static int | |||
LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) | |||
{ | |||
+ static const char module[] = "LogL16Encode"; | |||
LogLuvState* sp = EncoderState(tif); | |||
int shft; | |||
tmsize_t i; | |||
@@ -433,7 +452,11 @@ LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) | |||
tp = (int16*) bp; | |||
else { | |||
tp = (int16*) sp->tbuf; | |||
- assert(sp->tbuflen >= npixels); | |||
+ if(sp->tbuflen < npixels) { | |||
+ TIFFErrorExt(tif->tif_clientdata, module, | |||
+ "Translation buffer too short"); | |||
+ return (0); | |||
+ } | |||
(*sp->tfunc)(sp, bp, npixels); | |||
} | |||
/* compress each byte string */ | |||
@@ -506,6 +529,7 @@ LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) | |||
static int | |||
LogLuvEncode24(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) | |||
{ | |||
+ static const char module[] = "LogLuvEncode24"; | |||
LogLuvState* sp = EncoderState(tif); | |||
tmsize_t i; | |||
tmsize_t npixels; | |||
@@ -521,7 +545,11 @@ LogLuvEncode24(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) | |||
tp = (uint32*) bp; | |||
else { | |||
tp = (uint32*) sp->tbuf; | |||
- assert(sp->tbuflen >= npixels); | |||
+ if(sp->tbuflen < npixels) { | |||
+ TIFFErrorExt(tif->tif_clientdata, module, | |||
+ "Translation buffer too short"); | |||
+ return (0); | |||
+ } | |||
(*sp->tfunc)(sp, bp, npixels); | |||
} | |||
/* write out encoded pixels */ | |||
@@ -553,6 +581,7 @@ LogLuvEncode24(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) | |||
static int | |||
LogLuvEncode32(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) | |||
{ | |||
+ static const char module[] = "LogLuvEncode32"; | |||
LogLuvState* sp = EncoderState(tif); | |||
int shft; | |||
tmsize_t i; | |||
@@ -574,7 +603,11 @@ LogLuvEncode32(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) | |||
tp = (uint32*) bp; | |||
else { | |||
tp = (uint32*) sp->tbuf; | |||
- assert(sp->tbuflen >= npixels); | |||
+ if(sp->tbuflen < npixels) { | |||
+ TIFFErrorExt(tif->tif_clientdata, module, | |||
+ "Translation buffer too short"); | |||
+ return (0); | |||
+ } | |||
(*sp->tfunc)(sp, bp, npixels); | |||
} | |||
/* compress each byte string */ |
@ -1,72 +0,0 @@ | |||
From 237c9c18b0b3479950e54a755ae428bf0f55f754 Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Sun, 27 Dec 2015 16:55:20 +0000 | |||
Subject: [PATCH] * libtiff/tif_next.c: fix potential out-of-bound write in | |||
NeXTDecode() triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif | |||
(bugzilla #2508) | |||
--- | |||
ChangeLog | 6 ++++++ | |||
libtiff/tif_next.c | 12 +++++++++--- | |||
2 files changed, 15 insertions(+), 3 deletions(-) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index b8aa23c..04926a3 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,11 @@ | |||
2015-12-27 Even Rouault <even.rouault at spatialys.com> | |||
+ * libtiff/tif_next.c: fix potential out-of-bound write in NeXTDecode() | |||
+ triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif | |||
+ (bugzilla #2508) | |||
+ | |||
+2015-12-27 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* libtiff/tif_luv.c: fix potential out-of-bound writes in decode | |||
functions in non debug builds by replacing assert()s by regular if | |||
checks (bugzilla #2522). | |||
diff --git a/libtiff/tif_next.c b/libtiff/tif_next.c | |||
index 17e0311..1248caa 100644 | |||
--- a/libtiff/tif_next.c | |||
+++ b/libtiff/tif_next.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tif_next.c,v 1.16 2014-12-29 12:09:11 erouault Exp $ */ | |||
+/* $Id: tif_next.c,v 1.17 2015-12-27 16:55:20 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1988-1997 Sam Leffler | |||
@@ -37,7 +37,7 @@ | |||
case 0: op[0] = (unsigned char) ((v) << 6); break; \ | |||
case 1: op[0] |= (v) << 4; break; \ | |||
case 2: op[0] |= (v) << 2; break; \ | |||
- case 3: *op++ |= (v); break; \ | |||
+ case 3: *op++ |= (v); op_offset++; break; \ | |||
} \ | |||
} | |||
@@ -106,6 +106,7 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s) | |||
uint32 imagewidth = tif->tif_dir.td_imagewidth; | |||
if( isTiled(tif) ) | |||
imagewidth = tif->tif_dir.td_tilewidth; | |||
+ tmsize_t op_offset = 0; | |||
/* | |||
* The scanline is composed of a sequence of constant | |||
@@ -122,10 +123,15 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s) | |||
* bounds, potentially resulting in a security | |||
* issue. | |||
*/ | |||
- while (n-- > 0 && npixels < imagewidth) | |||
+ while (n-- > 0 && npixels < imagewidth && op_offset < scanline) | |||
SETPIXEL(op, grey); | |||
if (npixels >= imagewidth) | |||
break; | |||
+ if (op_offset >= scanline ) { | |||
+ TIFFErrorExt(tif->tif_clientdata, module, "Invalid data for scanline %ld", | |||
+ (long) tif->tif_row); | |||
+ return (0); | |||
+ } | |||
if (cc == 0) | |||
goto bad; | |||
n = *bp++, cc--; |
@ -0,0 +1,64 @@ | |||
commit 8c101323f5789ef6a0db952d53794e9c4ba48207 | |||
Author: erouault <erouault> | |||
Date: Fri Dec 2 21:56:56 2016 +0000 | |||
* libtiff/tif_read.c, libtiff/tiffiop.h: fix uint32 overflow in | |||
TIFFReadEncodedStrip() that caused an integer division by zero. | |||
Reported by Agostino Sarubbo. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2596 | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 46a5d7c..668b66a 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,3 +1,10 @@ | |||
+2016-12-02 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
+ * libtiff/tif_read.c, libtiff/tiffiop.h: fix uint32 overflow in | |||
+ TIFFReadEncodedStrip() that caused an integer division by zero. | |||
+ Reported by Agostino Sarubbo. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2596 | |||
+ | |||
2016-11-19 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | |||
* libtiff 4.0.7 released. | |||
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c | |||
index 8003592..29a311d 100644 | |||
--- a/libtiff/tif_read.c | |||
+++ b/libtiff/tif_read.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tif_read.c,v 1.49 2016-07-10 18:00:21 erouault Exp $ */ | |||
+/* $Id: tif_read.c,v 1.50 2016-12-02 21:56:56 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1988-1997 Sam Leffler | |||
@@ -346,7 +346,7 @@ TIFFReadEncodedStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size) | |||
rowsperstrip=td->td_rowsperstrip; | |||
if (rowsperstrip>td->td_imagelength) | |||
rowsperstrip=td->td_imagelength; | |||
- stripsperplane=((td->td_imagelength+rowsperstrip-1)/rowsperstrip); | |||
+ stripsperplane= TIFFhowmany_32_maxuint_compat(td->td_imagelength, rowsperstrip); | |||
stripinplane=(strip%stripsperplane); | |||
plane=(uint16)(strip/stripsperplane); | |||
rows=td->td_imagelength-stripinplane*rowsperstrip; | |||
diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h | |||
index 8bcd0c1..5294ee7 100644 | |||
--- a/libtiff/tiffiop.h | |||
+++ b/libtiff/tiffiop.h | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tiffiop.h,v 1.89 2016-01-23 21:20:34 erouault Exp $ */ | |||
+/* $Id: tiffiop.h,v 1.90 2016-12-02 21:56:56 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1988-1997 Sam Leffler | |||
@@ -250,6 +250,10 @@ struct tiff { | |||
#define TIFFhowmany_32(x, y) (((uint32)x < (0xffffffff - (uint32)(y-1))) ? \ | |||
((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y))) : \ | |||
0U) | |||
+/* Variant of TIFFhowmany_32() that doesn't return 0 if x close to MAXUINT. */ | |||
+/* Caution: TIFFhowmany_32_maxuint_compat(x,y)*y might overflow */ | |||
+#define TIFFhowmany_32_maxuint_compat(x, y) \ | |||
+ (((uint32)(x) / (uint32)(y)) + ((((uint32)(x) % (uint32)(y)) != 0) ? 1 : 0)) | |||
#define TIFFhowmany8_32(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3) | |||
#define TIFFroundup_32(x, y) (TIFFhowmany_32(x,y)*(y)) | |||
#define TIFFhowmany_64(x, y) ((((uint64)(x))+(((uint64)(y))-1))/((uint64)(y))) |
@ -0,0 +1,45 @@ | |||
commit b412777317cabbf8ed89ca38fb180991cca89b8c | |||
Author: erouault <erouault> | |||
Date: Fri Dec 2 22:13:32 2016 +0000 | |||
* tools/tiffcp.c: avoid uint32 underflow in cpDecodedStrips that | |||
can cause various issues, such as buffer overflows in the library. | |||
Reported by Agostino Sarubbo. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2598 | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 668b66a..0f154d6 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,12 @@ | |||
2016-12-02 Even Rouault <even.rouault at spatialys.com> | |||
+ * tools/tiffcp.c: avoid uint32 underflow in cpDecodedStrips that | |||
+ can cause various issues, such as buffer overflows in the library. | |||
+ Reported by Agostino Sarubbo. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2598 | |||
+ | |||
+2016-12-02 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* libtiff/tif_read.c, libtiff/tiffiop.h: fix uint32 overflow in | |||
TIFFReadEncodedStrip() that caused an integer division by zero. | |||
Reported by Agostino Sarubbo. | |||
diff --git a/tools/tiffcp.c b/tools/tiffcp.c | |||
index 338a3d1..6dfb9a9 100644 | |||
--- a/tools/tiffcp.c | |||
+++ b/tools/tiffcp.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tiffcp.c,v 1.55 2016-10-08 15:54:57 erouault Exp $ */ | |||
+/* $Id: tiffcp.c,v 1.56 2016-12-02 22:13:32 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1988-1997 Sam Leffler | |||
@@ -985,7 +985,7 @@ DECLAREcpFunc(cpDecodedStrips) | |||
tstrip_t s, ns = TIFFNumberOfStrips(in); | |||
uint32 row = 0; | |||
_TIFFmemset(buf, 0, stripsize); | |||
- for (s = 0; s < ns; s++) { | |||
+ for (s = 0; s < ns && row < imagelength; s++) { | |||
tsize_t cc = (row + rowsperstrip > imagelength) ? | |||
TIFFVStripSize(in, imagelength - row) : stripsize; | |||
if (TIFFReadEncodedStrip(in, s, buf, cc) < 0 |
@ -0,0 +1,131 @@ | |||
commit da99990ba6e1203798a59eb836fc6433ed6e3d66 | |||
Author: erouault <erouault> | |||
Date: Fri Dec 2 23:05:51 2016 +0000 | |||
* libtiff/tif_pixarlog.c, libtiff/tif_luv.c: fix heap-based buffer | |||
overflow on generation of PixarLog / LUV compressed files, with | |||
ColorMap, TransferFunction attached and nasty plays with bitspersample. | |||
The fix for LUV has not been tested, but suffers from the same kind | |||
of issue of PixarLog. | |||
Reported by Agostino Sarubbo. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2604 | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 0f154d6..93c01f8 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,3 +1,13 @@ | |||
+2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
+ * libtiff/tif_pixarlog.c, libtiff/tif_luv.c: fix heap-based buffer | |||
+ overflow on generation of PixarLog / LUV compressed files, with | |||
+ ColorMap, TransferFunction attached and nasty plays with bitspersample. | |||
+ The fix for LUV has not been tested, but suffers from the same kind | |||
+ of issue of PixarLog. | |||
+ Reported by Agostino Sarubbo. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2604 | |||
+ | |||
2016-12-02 Even Rouault <even.rouault at spatialys.com> | |||
* tools/tiffcp.c: avoid uint32 underflow in cpDecodedStrips that | |||
diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c | |||
index ca08f30..f42ac01 100644 | |||
--- a/libtiff/tif_luv.c | |||
+++ b/libtiff/tif_luv.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tif_luv.c,v 1.43 2016-09-04 21:32:56 erouault Exp $ */ | |||
+/* $Id: tif_luv.c,v 1.44 2016-12-02 23:05:51 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1997 Greg Ward Larson | |||
@@ -158,6 +158,7 @@ | |||
typedef struct logLuvState LogLuvState; | |||
struct logLuvState { | |||
+ int encoder_state; /* 1 if encoder correctly initialized */ | |||
int user_datafmt; /* user data format */ | |||
int encode_meth; /* encoding method */ | |||
int pixel_size; /* bytes per pixel */ | |||
@@ -1552,6 +1553,7 @@ LogLuvSetupEncode(TIFF* tif) | |||
td->td_photometric, "must be either LogLUV or LogL"); | |||
break; | |||
} | |||
+ sp->encoder_state = 1; | |||
return (1); | |||
notsupported: | |||
TIFFErrorExt(tif->tif_clientdata, module, | |||
@@ -1563,19 +1565,27 @@ notsupported: | |||
static void | |||
LogLuvClose(TIFF* tif) | |||
{ | |||
+ LogLuvState* sp = (LogLuvState*) tif->tif_data; | |||
TIFFDirectory *td = &tif->tif_dir; | |||
+ assert(sp != 0); | |||
/* | |||
* For consistency, we always want to write out the same | |||
* bitspersample and sampleformat for our TIFF file, | |||
* regardless of the data format being used by the application. | |||
* Since this routine is called after tags have been set but | |||
* before they have been recorded in the file, we reset them here. | |||
+ * Note: this is really a nasty approach. See PixarLogClose | |||
*/ | |||
- td->td_samplesperpixel = | |||
- (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3; | |||
- td->td_bitspersample = 16; | |||
- td->td_sampleformat = SAMPLEFORMAT_INT; | |||
+ if( sp->encoder_state ) | |||
+ { | |||
+ /* See PixarLogClose. Might avoid issues with tags whose size depends | |||
+ * on those below, but not completely sure this is enough. */ | |||
+ td->td_samplesperpixel = | |||
+ (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3; | |||
+ td->td_bitspersample = 16; | |||
+ td->td_sampleformat = SAMPLEFORMAT_INT; | |||
+ } | |||
} | |||
static void | |||
diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c | |||
index f4af2ba..9836dce 100644 | |||
--- a/libtiff/tif_pixarlog.c | |||
+++ b/libtiff/tif_pixarlog.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tif_pixarlog.c,v 1.48 2016-09-23 22:12:18 erouault Exp $ */ | |||
+/* $Id: tif_pixarlog.c,v 1.49 2016-12-02 23:05:51 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1996-1997 Sam Leffler | |||
@@ -1233,8 +1233,10 @@ PixarLogPostEncode(TIFF* tif) | |||
static void | |||
PixarLogClose(TIFF* tif) | |||
{ | |||
+ PixarLogState* sp = (PixarLogState*) tif->tif_data; | |||
TIFFDirectory *td = &tif->tif_dir; | |||
+ assert(sp != 0); | |||
/* In a really sneaky (and really incorrect, and untruthful, and | |||
* troublesome, and error-prone) maneuver that completely goes against | |||
* the spirit of TIFF, and breaks TIFF, on close, we covertly | |||
@@ -1243,8 +1245,19 @@ PixarLogClose(TIFF* tif) | |||
* readers that don't know about PixarLog, or how to set | |||
* the PIXARLOGDATFMT pseudo-tag. | |||
*/ | |||
- td->td_bitspersample = 8; | |||
- td->td_sampleformat = SAMPLEFORMAT_UINT; | |||
+ | |||
+ if (sp->state&PLSTATE_INIT) { | |||
+ /* We test the state to avoid an issue such as in | |||
+ * http://bugzilla.maptools.org/show_bug.cgi?id=2604 | |||
+ * What appends in that case is that the bitspersample is 1 and | |||
+ * a TransferFunction is set. The size of the TransferFunction | |||
+ * depends on 1<<bitspersample. So if we increase it, an access | |||
+ * out of the buffer will happen at directory flushing. | |||
+ * Another option would be to clear those targs. | |||
+ */ | |||
+ td->td_bitspersample = 8; | |||
+ td->td_sampleformat = SAMPLEFORMAT_UINT; | |||
+ } | |||
} | |||
static void |
@ -0,0 +1,135 @@ | |||
commit c533d200ecc45e00892a94f9bb2e762a5aa0b2ce | |||
Author: erouault <erouault> | |||
Date: Sat Dec 3 11:02:15 2016 +0000 | |||
* libtiff/tif_dirread.c: modify ChopUpSingleUncompressedStrip() to | |||
instanciate compute ntrips as TIFFhowmany_32(td->td_imagelength, rowsperstrip), | |||
instead of a logic based on the total size of data. Which is faulty is | |||
the total size of data is not sufficient to fill the whole image, and thus | |||
results in reading outside of the StripByCounts/StripOffsets arrays when | |||
using TIFFReadScanline(). | |||
Reported by Agostino Sarubbo. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2608. | |||
* libtiff/tif_strip.c: revert the change in TIFFNumberOfStrips() done | |||
for http://bugzilla.maptools.org/show_bug.cgi?id=2587 / CVE-2016-9273 since | |||
the above change is a better fix that makes it unnecessary. | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 93c01f8..9dbc7a0 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,20 @@ | |||
2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ * libtiff/tif_dirread.c: modify ChopUpSingleUncompressedStrip() to | |||
+ instanciate compute ntrips as TIFFhowmany_32(td->td_imagelength, rowsperstrip), | |||
+ instead of a logic based on the total size of data. Which is faulty is | |||
+ the total size of data is not sufficient to fill the whole image, and thus | |||
+ results in reading outside of the StripByCounts/StripOffsets arrays when | |||
+ using TIFFReadScanline(). | |||
+ Reported by Agostino Sarubbo. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2608. | |||
+ | |||
+ * libtiff/tif_strip.c: revert the change in TIFFNumberOfStrips() done | |||
+ for http://bugzilla.maptools.org/show_bug.cgi?id=2587 / CVE-2016-9273 since | |||
+ the above change is a better fix that makes it unnecessary. | |||
+ | |||
+2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* libtiff/tif_pixarlog.c, libtiff/tif_luv.c: fix heap-based buffer | |||
overflow on generation of PixarLog / LUV compressed files, with | |||
ColorMap, TransferFunction attached and nasty plays with bitspersample. | |||
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c | |||
index 01070f2..f290528 100644 | |||
--- a/libtiff/tif_dirread.c | |||
+++ b/libtiff/tif_dirread.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tif_dirread.c,v 1.204 2016-11-16 15:14:15 erouault Exp $ */ | |||
+/* $Id: tif_dirread.c,v 1.205 2016-12-03 11:02:15 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1988-1997 Sam Leffler | |||
@@ -5502,8 +5502,7 @@ ChopUpSingleUncompressedStrip(TIFF* tif) | |||
uint64 rowblockbytes; | |||
uint64 stripbytes; | |||
uint32 strip; | |||
- uint64 nstrips64; | |||
- uint32 nstrips32; | |||
+ uint32 nstrips; | |||
uint32 rowsperstrip; | |||
uint64* newcounts; | |||
uint64* newoffsets; | |||
@@ -5534,18 +5533,17 @@ ChopUpSingleUncompressedStrip(TIFF* tif) | |||
return; | |||
/* | |||
- * never increase the number of strips in an image | |||
+ * never increase the number of rows per strip | |||
*/ | |||
if (rowsperstrip >= td->td_rowsperstrip) | |||
return; | |||
- nstrips64 = TIFFhowmany_64(bytecount, stripbytes); | |||
- if ((nstrips64==0)||(nstrips64>0xFFFFFFFF)) /* something is wonky, do nothing. */ | |||
- return; | |||
- nstrips32 = (uint32)nstrips64; | |||
+ nstrips = TIFFhowmany_32(td->td_imagelength, rowsperstrip); | |||
+ if( nstrips == 0 ) | |||
+ return; | |||
- newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64), | |||
+ newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64), | |||
"for chopped \"StripByteCounts\" array"); | |||
- newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64), | |||
+ newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64), | |||
"for chopped \"StripOffsets\" array"); | |||
if (newcounts == NULL || newoffsets == NULL) { | |||
/* | |||
@@ -5562,18 +5560,18 @@ ChopUpSingleUncompressedStrip(TIFF* tif) | |||
* Fill the strip information arrays with new bytecounts and offsets | |||
* that reflect the broken-up format. | |||
*/ | |||
- for (strip = 0; strip < nstrips32; strip++) { | |||
+ for (strip = 0; strip < nstrips; strip++) { | |||
if (stripbytes > bytecount) | |||
stripbytes = bytecount; | |||
newcounts[strip] = stripbytes; | |||
- newoffsets[strip] = offset; | |||
+ newoffsets[strip] = stripbytes ? offset : 0; | |||
offset += stripbytes; | |||
bytecount -= stripbytes; | |||
} | |||
/* | |||
* Replace old single strip info with multi-strip info. | |||
*/ | |||
- td->td_stripsperimage = td->td_nstrips = nstrips32; | |||
+ td->td_stripsperimage = td->td_nstrips = nstrips; | |||
TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip); | |||
_TIFFfree(td->td_stripbytecount); | |||
diff --git a/libtiff/tif_strip.c b/libtiff/tif_strip.c | |||
index b6098dd..6e9f2ef 100644 | |||
--- a/libtiff/tif_strip.c | |||
+++ b/libtiff/tif_strip.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tif_strip.c,v 1.37 2016-11-09 23:00:49 erouault Exp $ */ | |||
+/* $Id: tif_strip.c,v 1.38 2016-12-03 11:02:15 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1991-1997 Sam Leffler | |||
@@ -63,15 +63,6 @@ TIFFNumberOfStrips(TIFF* tif) | |||
TIFFDirectory *td = &tif->tif_dir; | |||
uint32 nstrips; | |||
- /* If the value was already computed and store in td_nstrips, then return it, | |||
- since ChopUpSingleUncompressedStrip might have altered and resized the | |||
- since the td_stripbytecount and td_stripoffset arrays to the new value | |||
- after the initial affectation of td_nstrips = TIFFNumberOfStrips() in | |||
- tif_dirread.c ~line 3612. | |||
- See http://bugzilla.maptools.org/show_bug.cgi?id=2587 */ | |||
- if( td->td_nstrips ) | |||
- return td->td_nstrips; | |||
- | |||
nstrips = (td->td_rowsperstrip == (uint32) -1 ? 1 : | |||
TIFFhowmany_32(td->td_imagelength, td->td_rowsperstrip)); | |||
if (td->td_planarconfig == PLANARCONFIG_SEPARATE) |
@ -0,0 +1,67 @@ | |||
commit 43576568ed4af4bd43409b7ff36939340141dfd6 | |||
Author: erouault <erouault> | |||
Date: Sat Dec 3 11:15:18 2016 +0000 | |||
* libtiff/tif_ojpeg.c: make OJPEGDecode() early exit in case of failure in | |||
OJPEGPreDecode(). This will avoid a divide by zero, and potential other issues. | |||
Reported by Agostino Sarubbo. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2611 | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 9dbc7a0..5b23665 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,12 @@ | |||
2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ * libtiff/tif_ojpeg.c: make OJPEGDecode() early exit in case of failure in | |||
+ OJPEGPreDecode(). This will avoid a divide by zero, and potential other issues. | |||
+ Reported by Agostino Sarubbo. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2611 | |||
+ | |||
+2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* libtiff/tif_dirread.c: modify ChopUpSingleUncompressedStrip() to | |||
instanciate compute ntrips as TIFFhowmany_32(td->td_imagelength, rowsperstrip), | |||
instead of a logic based on the total size of data. Which is faulty is | |||
diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c | |||
index 30a1812..93839d8 100644 | |||
--- a/libtiff/tif_ojpeg.c | |||
+++ b/libtiff/tif_ojpeg.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tif_ojpeg.c,v 1.65 2016-09-04 21:32:56 erouault Exp $ */ | |||
+/* $Id: tif_ojpeg.c,v 1.66 2016-12-03 11:15:18 erouault Exp $ */ | |||
/* WARNING: The type of JPEG encapsulation defined by the TIFF Version 6.0 | |||
specification is now totally obsolete and deprecated for new applications and | |||
@@ -244,6 +244,7 @@ typedef enum { | |||
typedef struct { | |||
TIFF* tif; | |||
+ int decoder_ok; | |||
#ifndef LIBJPEG_ENCAP_EXTERNAL | |||
JMP_BUF exit_jmpbuf; | |||
#endif | |||
@@ -722,6 +723,7 @@ OJPEGPreDecode(TIFF* tif, uint16 s) | |||
} | |||
sp->write_curstrile++; | |||
} | |||
+ sp->decoder_ok = 1; | |||
return(1); | |||
} | |||
@@ -784,8 +786,14 @@ OJPEGPreDecodeSkipScanlines(TIFF* tif) | |||
static int | |||
OJPEGDecode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s) | |||
{ | |||
+ static const char module[]="OJPEGDecode"; | |||
OJPEGState* sp=(OJPEGState*)tif->tif_data; | |||
(void)s; | |||
+ if( !sp->decoder_ok ) | |||
+ { | |||
+ TIFFErrorExt(tif->tif_clientdata,module,"Cannot decode: decoder not correctly initialized"); | |||
+ return 0; | |||
+ } | |||
if (sp->libjpeg_jpeg_query_style==0) | |||
{ | |||
if (OJPEGDecodeRaw(tif,buf,cc)==0) |
@ -0,0 +1,45 @@ | |||
commit 4307dad7fc153baefeb6bb677060e9c5157e5d42 | |||
Author: erouault <erouault> | |||
Date: Sat Dec 3 11:35:56 2016 +0000 | |||
* tools/tiffcrop.c: fix readContigStripsIntoBuffer() in -i (ignore) mode so | |||
that the output buffer is correctly incremented to avoid write outside bounds. | |||
Reported by Agostino Sarubbo. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2620 | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 5b23665..d6a416b 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,12 @@ | |||
2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ * tools/tiffcrop.c: fix readContigStripsIntoBuffer() in -i (ignore) mode so | |||
+ that the output buffer is correctly incremented to avoid write outside bounds. | |||
+ Reported by Agostino Sarubbo. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2620 | |||
+ | |||
+2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* libtiff/tif_ojpeg.c: make OJPEGDecode() early exit in case of failure in | |||
OJPEGPreDecode(). This will avoid a divide by zero, and potential other issues. | |||
Reported by Agostino Sarubbo. | |||
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c | |||
index 722b132..bdcbd63 100644 | |||
--- a/tools/tiffcrop.c | |||
+++ b/tools/tiffcrop.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tiffcrop.c,v 1.46 2016-11-18 14:58:46 erouault Exp $ */ | |||
+/* $Id: tiffcrop.c,v 1.47 2016-12-03 11:35:56 erouault Exp $ */ | |||
/* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of | |||
* the image data through additional options listed below | |||
@@ -3698,7 +3698,7 @@ static int readContigStripsIntoBuffer (TIFF* in, uint8* buf) | |||
(unsigned long) strip, (unsigned long)rows); | |||
return 0; | |||
} | |||
- bufp += bytes_read; | |||
+ bufp += stripsize; | |||
} | |||
return 1; |
@ -0,0 +1,65 @@ | |||
commit 17d56c24c10ed300233164cc51380979124d6dd8 | |||
Author: erouault <erouault> | |||
Date: Sat Dec 3 12:19:32 2016 +0000 | |||
* tools/tiffcrop.c: add 3 extra bytes at end of strip buffer in | |||
readSeparateStripsIntoBuffer() to avoid read outside of heap allocated buffer. | |||
Reported by Agostino Sarubbo. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2621 | |||
diff --git a/ChangeLog b/ChangeLog | |||
index d6a416b..50db803 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,12 @@ | |||
2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ * tools/tiffcrop.c: add 3 extra bytes at end of strip buffer in | |||
+ readSeparateStripsIntoBuffer() to avoid read outside of heap allocated buffer. | |||
+ Reported by Agostino Sarubbo. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2621 | |||
+ | |||
+2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* tools/tiffcrop.c: fix readContigStripsIntoBuffer() in -i (ignore) mode so | |||
that the output buffer is correctly incremented to avoid write outside bounds. | |||
Reported by Agostino Sarubbo. | |||
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c | |||
index bdcbd63..9122aab 100644 | |||
--- a/tools/tiffcrop.c | |||
+++ b/tools/tiffcrop.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tiffcrop.c,v 1.47 2016-12-03 11:35:56 erouault Exp $ */ | |||
+/* $Id: tiffcrop.c,v 1.48 2016-12-03 12:19:32 erouault Exp $ */ | |||
/* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of | |||
* the image data through additional options listed below | |||
@@ -4815,10 +4815,17 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8 *obuf, uint32 length, | |||
nstrips = TIFFNumberOfStrips(in); | |||
strips_per_sample = nstrips /spp; | |||
+ /* Add 3 padding bytes for combineSeparateSamples32bits */ | |||
+ if( (size_t) stripsize > 0xFFFFFFFFU - 3U ) | |||
+ { | |||
+ TIFFError("readSeparateStripsIntoBuffer", "Integer overflow when calculating buffer size."); | |||
+ exit(-1); | |||
+ } | |||
+ | |||
for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++) | |||
{ | |||
srcbuffs[s] = NULL; | |||
- buff = _TIFFmalloc(stripsize); | |||
+ buff = _TIFFmalloc(stripsize + 3); | |||
if (!buff) | |||
{ | |||
TIFFError ("readSeparateStripsIntoBuffer", | |||
@@ -4827,6 +4834,9 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8 *obuf, uint32 length, | |||
_TIFFfree (srcbuffs[i]); | |||
return 0; | |||
} | |||
+ buff[stripsize] = 0; | |||
+ buff[stripsize+1] = 0; | |||
+ buff[stripsize+2] = 0; | |||
srcbuffs[s] = buff; | |||
} | |||
@ -0,0 +1,61 @@ | |||
commit fc9eedf265394eb8a5633160a8fcdb7ece072701 | |||
Author: erouault <erouault> | |||
Date: Sat Dec 3 13:00:03 2016 +0000 | |||
* tools/tiffcrop.c: fix integer division by zero when BitsPerSample is missing. | |||
Reported by Agostino Sarubbo. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2619 | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 50db803..2940828 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,11 @@ | |||
2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ * tools/tiffcrop.c: fix integer division by zero when BitsPerSample is missing. | |||
+ Reported by Agostino Sarubbo. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2619 | |||
+ | |||
+2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* tools/tiffcrop.c: add 3 extra bytes at end of strip buffer in | |||
readSeparateStripsIntoBuffer() to avoid read outside of heap allocated buffer. | |||
Reported by Agostino Sarubbo. | |||
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c | |||
index 9122aab..21dd087 100644 | |||
--- a/tools/tiffcrop.c | |||
+++ b/tools/tiffcrop.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tiffcrop.c,v 1.48 2016-12-03 12:19:32 erouault Exp $ */ | |||
+/* $Id: tiffcrop.c,v 1.49 2016-12-03 13:00:04 erouault Exp $ */ | |||
/* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of | |||
* the image data through additional options listed below | |||
@@ -1164,7 +1164,7 @@ writeBufferToSeparateStrips (TIFF* out, uint8* buf, | |||
tdata_t obuf; | |||
(void) TIFFGetFieldDefaulted(out, TIFFTAG_ROWSPERSTRIP, &rowsperstrip); | |||
- (void) TIFFGetField(out, TIFFTAG_BITSPERSAMPLE, &bps); | |||
+ (void) TIFFGetFieldDefaulted(out, TIFFTAG_BITSPERSAMPLE, &bps); | |||
bytes_per_sample = (bps + 7) / 8; | |||
if( width == 0 || | |||
(uint32)bps * (uint32)spp > TIFF_UINT32_MAX / width || | |||
@@ -4760,7 +4760,7 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8 *obuf, uint32 length, | |||
int i, bytes_per_sample, bytes_per_pixel, shift_width, result = 1; | |||
uint32 j; | |||
int32 bytes_read = 0; | |||
- uint16 bps, planar; | |||
+ uint16 bps = 0, planar; | |||
uint32 nstrips; | |||
uint32 strips_per_sample; | |||
uint32 src_rowsize, dst_rowsize, rows_processed, rps; | |||
@@ -4780,7 +4780,7 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8 *obuf, uint32 length, | |||
} | |||
memset (srcbuffs, '\0', sizeof(srcbuffs)); | |||
- TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps); | |||
+ TIFFGetFieldDefaulted(in, TIFFTAG_BITSPERSAMPLE, &bps); | |||
TIFFGetFieldDefaulted(in, TIFFTAG_PLANARCONFIG, &planar); | |||
TIFFGetFieldDefaulted(in, TIFFTAG_ROWSPERSTRIP, &rps); | |||
if (rps > length) |
@ -0,0 +1,45 @@ | |||
commit a1d523c27dafafadf589c77e834c52661f1c78fc | |||
Author: erouault <erouault> | |||
Date: Sat Dec 3 14:18:48 2016 +0000 | |||
* tools/tiffinfo.c: fix null pointer dereference in -r mode when the image has | |||
no StripByteCount tag. | |||
Reported by Agostino Sarubbo. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2594 | |||
diff --git a/ChangeLog b/ChangeLog | |||
index dd27c7f..e41d00c 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,12 @@ | |||
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. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2594 | |||
+ | |||
+2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* tools/tiffcrop.c: fix integer division by zero when BitsPerSample is missing. | |||
Reported by Agostino Sarubbo. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2619 | |||
diff --git a/tools/tiffinfo.c b/tools/tiffinfo.c | |||
index b02c7d4..4d58055 100644 | |||
--- a/tools/tiffinfo.c | |||
+++ b/tools/tiffinfo.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tiffinfo.c,v 1.25 2016-11-12 20:06:05 bfriesen Exp $ */ | |||
+/* $Id: tiffinfo.c,v 1.26 2016-12-03 14:18:49 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1988-1997 Sam Leffler | |||
@@ -417,7 +417,7 @@ TIFFReadRawData(TIFF* tif, int bitrev) | |||
uint64* stripbc=NULL; | |||
TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &stripbc); | |||
- if (nstrips > 0) { | |||
+ if (stripbc != NULL && nstrips > 0) { | |||
uint32 bufsize = (uint32) stripbc[0]; | |||
tdata_t buf = _TIFFmalloc(bufsize); | |||
tstrip_t s; |
@ -0,0 +1,58 @@ | |||
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; | |||
@ -0,0 +1,74 @@ | |||
commit 9991b31a7c651e7b87a3ccd73b3dc5c67dcfdd60 | |||
Author: erouault <erouault> | |||
Date: Sat Dec 3 15:30:31 2016 +0000 | |||
* tools/tif_dir.c: when TIFFGetField(, TIFFTAG_NUMBEROFINKS, ) is called, | |||
limit the return number of inks to SamplesPerPixel, so that code that parses | |||
ink names doesn't go past the end of the buffer. | |||
Reported by Agostino Sarubbo. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2599 | |||
Reported by Agostino Sarubbo. | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 0d7b12d..fb9fc0e 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,13 @@ | |||
2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ * tools/tif_dir.c: when TIFFGetField(, TIFFTAG_NUMBEROFINKS, ) is called, | |||
+ limit the return number of inks to SamplesPerPixel, so that code that parses | |||
+ ink names doesn't go past the end of the buffer. | |||
+ Reported by Agostino Sarubbo. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2599 | |||
+ | |||
+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. | |||
diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c | |||
index ad21655..2574e74 100644 | |||
--- a/libtiff/tif_dir.c | |||
+++ b/libtiff/tif_dir.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tif_dir.c,v 1.127 2016-10-25 21:35:15 erouault Exp $ */ | |||
+/* $Id: tif_dir.c,v 1.128 2016-12-03 15:30:31 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1988-1997 Sam Leffler | |||
@@ -854,6 +854,32 @@ _TIFFVGetField(TIFF* tif, uint32 tag, va_list ap) | |||
if( fip == NULL ) /* cannot happen since TIFFGetField() already checks it */ | |||
return 0; | |||
+ if( tag == TIFFTAG_NUMBEROFINKS ) | |||
+ { | |||
+ int i; | |||
+ for (i = 0; i < td->td_customValueCount; i++) { | |||
+ uint16 val; | |||
+ TIFFTagValue *tv = td->td_customValues + i; | |||
+ if (tv->info->field_tag != tag) | |||
+ continue; | |||
+ val = *(uint16 *)tv->value; | |||
+ /* Truncate to SamplesPerPixel, since the */ | |||
+ /* setting code for INKNAMES assume that there are SamplesPerPixel */ | |||
+ /* inknames. */ | |||
+ /* Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2599 */ | |||
+ if( val > td->td_samplesperpixel ) | |||
+ { | |||
+ TIFFWarningExt(tif->tif_clientdata,"_TIFFVGetField", | |||
+ "Truncating NumberOfInks from %u to %u", | |||
+ val, td->td_samplesperpixel); | |||
+ val = td->td_samplesperpixel; | |||
+ } | |||
+ *va_arg(ap, uint16*) = val; | |||
+ return 1; | |||
+ } | |||
+ return 0; | |||
+ } | |||
+ | |||
/* | |||
* We want to force the custom code to be used for custom | |||
* fields even if the tag happens to match a well known |
@ -0,0 +1,58 @@ | |||
commit 307a31765cb01245e3655ce168385dd7d51e14bd | |||
Author: erouault <erouault> | |||
Date: Sat Dec 3 15:44:15 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=2607 | |||
diff --git a/ChangeLog b/ChangeLog | |||
index ac2d922..94be038 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=2607 | |||
+ | |||
+2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* tools/tif_dir.c: when TIFFGetField(, TIFFTAG_NUMBEROFINKS, ) is called, | |||
limit the return number of inks to SamplesPerPixel, so that code that parses | |||
ink names doesn't go past the end of the buffer. | |||
diff --git a/tools/tiffcp.c b/tools/tiffcp.c | |||
index c8e48c3..142cbb0 100644 | |||
--- a/tools/tiffcp.c | |||
+++ b/tools/tiffcp.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tiffcp.c,v 1.57 2016-12-03 14:42:40 erouault Exp $ */ | |||
+/* $Id: tiffcp.c,v 1.58 2016-12-03 15:44:15 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1988-1997 Sam Leffler | |||
@@ -1569,7 +1569,7 @@ DECLAREwriteFunc(writeBufferToSeparateTiles) | |||
uint8* bufp = (uint8*) buf; | |||
uint32 tl, tw; | |||
uint32 row; | |||
- uint16 bps, bytes_per_sample; | |||
+ uint16 bps = 0, bytes_per_sample; | |||
obuf = _TIFFmalloc(TIFFTileSize(out)); | |||
if (obuf == NULL) | |||
@@ -1578,6 +1578,12 @@ DECLAREwriteFunc(writeBufferToSeparateTiles) | |||
(void) TIFFGetField(out, TIFFTAG_TILELENGTH, &tl); | |||
(void) TIFFGetField(out, TIFFTAG_TILEWIDTH, &tw); | |||
(void) TIFFGetField(out, TIFFTAG_BITSPERSAMPLE, &bps); | |||
+ if( bps == 0 ) | |||
+ { | |||
+ TIFFError(TIFFFileName(out), "Error, cannot read BitsPerSample"); | |||
+ _TIFFfree(obuf); | |||
+ return 0; | |||
+ } | |||
assert( bps % 8 == 0 ); | |||
bytes_per_sample = bps/8; | |||
@ -0,0 +1,63 @@ | |||
commit b34209fede77aa203cd5adcd9638ccc70731a50f | |||
Author: erouault <erouault> | |||
Date: Sat Dec 3 16:40:01 2016 +0000 | |||
* 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 | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 94be038..8ee76c0 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,12 @@ | |||
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> | |||
+ | |||
* tools/tiffcp.c: avoid potential division by zero if BitsPerSamples tag is | |||
missing. | |||
Reported by Agostino Sarubbo. | |||
diff --git a/tools/tiffcp.c b/tools/tiffcp.c | |||
index 142cbb0..6d96bb8 100644 | |||
--- a/tools/tiffcp.c | |||
+++ b/tools/tiffcp.c | |||
@@ -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 | |||
@@ -1163,7 +1163,7 @@ bad: | |||
static void | |||
cpStripToTile(uint8* out, uint8* in, | |||
- uint32 rows, uint32 cols, int outskew, int inskew) | |||
+ uint32 rows, uint32 cols, int outskew, int64 inskew) | |||
{ | |||
while (rows-- > 0) { | |||
uint32 j = cols; | |||
@@ -1320,7 +1320,7 @@ DECLAREreadFunc(readContigTilesIntoBuffer) | |||
tdata_t tilebuf; | |||
uint32 imagew = TIFFScanlineSize(in); | |||
uint32 tilew = TIFFTileRowSize(in); | |||
- int iskew = imagew - tilew; | |||
+ int64 iskew = (int64)imagew - (int64)tilew; | |||
uint8* bufp = (uint8*) buf; | |||
uint32 tw, tl; | |||
uint32 row; | |||
@@ -1348,7 +1348,7 @@ DECLAREreadFunc(readContigTilesIntoBuffer) | |||
status = 0; | |||
goto done; | |||
} | |||
- if (colb + tilew > imagew) { | |||
+ if (colb > iskew) { | |||
uint32 width = imagew - colb; | |||
uint32 oskew = tilew - width; | |||
cpStripToTile(bufp + colb, |
@ -0,0 +1,70 @@ | |||
commit 18bca4cf3057681689efb502175cbe5f01cb68c3 | |||
Author: erouault <erouault> | |||
Date: Sat Dec 3 16:50:02 2016 +0000 | |||
* tools/tiffcp.c: replace assert( (bps % 8) == 0 ) by a non assert check. | |||
Reported by Agostino Sarubbo. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2605 | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 8ee76c0..025eb72 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,11 @@ | |||
2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
+ * tools/tiffcp.c: replace assert( (bps % 8) == 0 ) by a non assert check. | |||
+ Reported by Agostino Sarubbo. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2605 | |||
+ | |||
+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. | |||
diff --git a/tools/tiffcp.c b/tools/tiffcp.c | |||
index 6d96bb8..49c9d37 100644 | |||
--- a/tools/tiffcp.c | |||
+++ b/tools/tiffcp.c | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tiffcp.c,v 1.59 2016-12-03 16:40:01 erouault Exp $ */ | |||
+/* $Id: tiffcp.c,v 1.60 2016-12-03 16:50:02 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1988-1997 Sam Leffler | |||
@@ -45,7 +45,6 @@ | |||
#include <string.h> | |||
#include <ctype.h> | |||
-#include <assert.h> | |||
#ifdef HAVE_UNISTD_H | |||
# include <unistd.h> | |||
@@ -1393,7 +1392,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer) | |||
status = 0; | |||
goto done; | |||
} | |||
- assert( bps % 8 == 0 ); | |||
+ if( (bps % 8) != 0 ) | |||
+ { | |||
+ TIFFError(TIFFFileName(in), "Error, cannot handle BitsPerSample that is not a multiple of 8"); | |||
+ status = 0; | |||
+ goto done; | |||
+ } | |||
bytes_per_sample = bps/8; | |||
for (row = 0; row < imagelength; row += tl) { | |||
@@ -1584,7 +1588,12 @@ DECLAREwriteFunc(writeBufferToSeparateTiles) | |||
_TIFFfree(obuf); | |||
return 0; | |||
} | |||
- assert( bps % 8 == 0 ); | |||
+ if( (bps % 8) != 0 ) | |||
+ { | |||
+ TIFFError(TIFFFileName(out), "Error, cannot handle BitsPerSample that is not a multiple of 8"); | |||
+ _TIFFfree(obuf); | |||
+ return 0; | |||
+ } | |||
bytes_per_sample = bps/8; | |||
for (row = 0; row < imagelength; row += tl) { |
@ -0,0 +1,54 @@ | |||
commit 8c9dbee088d8b43cdae47b9c5f711058bd1f17f1 | |||
Author: erouault <erouault> | |||
Date: Tue Dec 13 18:15:48 2016 +0000 | |||
* libtiff/tif_fax3.h: revert change done on 2016-01-09 that made | |||
Param member of TIFFFaxTabEnt structure a uint16 to reduce size of | |||
the binary. It happens that the Hylafax software uses the tables that | |||
follow this typedef (TIFFFaxMainTable, TIFFFaxWhiteTable, | |||
TIFFFaxBlackTable), also they are not in a public libtiff header. | |||
Raised by Lee Howard. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2636 | |||
diff --git a/ChangeLog b/ChangeLog | |||
index ee6fd802..558db20e 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,3 +1,13 @@ | |||
+2016-12-13 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
+ * libtiff/tif_fax3.h: revert change done on 2016-01-09 that made | |||
+ Param member of TIFFFaxTabEnt structure a uint16 to reduce size of | |||
+ the binary. It happens that the Hylafax software uses the tables that | |||
+ follow this typedef (TIFFFaxMainTable, TIFFFaxWhiteTable, | |||
+ TIFFFaxBlackTable), also they are not in a public libtiff header. | |||
+ Raised by Lee Howard. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2636 | |||
+ | |||
2016-12-03 Even Rouault <even.rouault at spatialys.com> | |||
* tools/tiffcp.c: replace assert( (bps % 8) == 0 ) by a non assert check. | |||
diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h | |||
index e0b2ca6b..45ce43f1 100644 | |||
--- a/libtiff/tif_fax3.h | |||
+++ b/libtiff/tif_fax3.h | |||
@@ -1,4 +1,4 @@ | |||
-/* $Id: tif_fax3.h,v 1.11 2016-01-23 21:20:34 erouault Exp $ */ | |||
+/* $Id: tif_fax3.h,v 1.12 2016-12-13 18:15:48 erouault Exp $ */ | |||
/* | |||
* Copyright (c) 1990-1997 Sam Leffler | |||
@@ -81,10 +81,12 @@ extern void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32); | |||
#define S_MakeUp 11 | |||
#define S_EOL 12 | |||
+/* WARNING: do not change the layout of this structure as the Halyfax software */ | |||
+/* really depends on it. See http://bugzilla.maptools.org/show_bug.cgi?id=2636 */ | |||
typedef struct { /* state table entry */ | |||
unsigned char State; /* see above */ | |||
unsigned char Width; /* width of code in bits */ | |||
- uint16 Param; /* unsigned 16-bit run length in bits */ | |||
+ uint32 Param; /* unsigned 32-bit run length in bits (holds on 16 bit actually, but cannot be changed. See above warning) */ | |||
} TIFFFaxTabEnt; | |||
extern const TIFFFaxTabEnt TIFFFaxMainTable[]; |
@ -0,0 +1,39 @@ | |||
From c7153361a4041260719b340f73f2f76b0969235c Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Tue, 20 Dec 2016 17:28:17 +0000 | |||
Subject: [PATCH] * tools/tiff2pdf.c: avoid potential heap-based overflow in | |||
t2p_readwrite_pdf_image_tile(). Fixes | |||
http://bugzilla.maptools.org/show_bug.cgi?id=2640 | |||
--- | |||
ChangeLog | 6 ++++++ | |||
tools/tiff2pdf.c | 2 +- | |||
2 files changed, 7 insertions(+), 1 deletion(-) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 6be3602..91ba4e6 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,3 +1,9 @@ | |||
+2016-12-20 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
+ * tools/tiff2pdf.c: avoid potential heap-based overflow in | |||
+ t2p_readwrite_pdf_image_tile(). | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2640 | |||
+ | |||
2016-12-13 Even Rouault <even.rouault at spatialys.com> | |||
* libtiff/tif_fax3.h: revert change done on 2016-01-09 that made | |||
diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c | |||
index 47d7629..db196e0 100644 | |||
--- a/tools/tiff2pdf.c | |||
+++ b/tools/tiff2pdf.c | |||
@@ -2895,7 +2895,7 @@ tsize_t t2p_readwrite_pdf_image_tile(T2P | |||
return(0); | |||
} | |||
if(TIFFGetField(input, TIFFTAG_JPEGTABLES, &count, &jpt) != 0) { | |||
- if (count >= 4) { | |||
+ if (count > 4) { | |||
/* Ignore EOI marker of JpegTables */ | |||
_TIFFmemcpy(buffer, jpt, count - 2); | |||
bufferoffset += count - 2; |
@ -0,0 +1,84 @@ | |||
From 5c080298d59efa53264d7248bbe3a04660db6ef7 Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Wed, 11 Jan 2017 19:25:44 +0000 | |||
Subject: [PATCH] * tools/tiffcp.c: error out cleanly in cpContig2SeparateByRow | |||
and cpSeparate2ContigByRow if BitsPerSample != 8 to avoid heap based | |||
overflow. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2656 and | |||
http://bugzilla.maptools.org/show_bug.cgi?id=2657 | |||
--- | |||
ChangeLog | 7 +++++++ | |||
tools/tiffcp.c | 24 ++++++++++++++++++++++-- | |||
2 files changed, 29 insertions(+), 2 deletions(-) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index f78cad0..064f25b 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,3 +1,10 @@ | |||
+2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
+ * tools/tiffcp.c: error out cleanly in cpContig2SeparateByRow and | |||
+ cpSeparate2ContigByRow if BitsPerSample != 8 to avoid heap based overflow. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2656 and | |||
+ http://bugzilla.maptools.org/show_bug.cgi?id=2657 | |||
+ | |||
2016-12-20 Even Rouault <even.rouault at spatialys.com> | |||
* tools/tiff2pdf.c: avoid potential heap-based overflow in | |||
diff --git a/tools/tiffcp.c b/tools/tiffcp.c | |||
index bdf754c..8bbcd52 100644 | |||
--- a/tools/tiffcp.c | |||
+++ b/tools/tiffcp.c | |||
@@ -591,7 +591,7 @@ static copyFunc pickCopyFunc(TIFF*, TIFF*, uint16, uint16); | |||
static int | |||
tiffcp(TIFF* in, TIFF* out) | |||
{ | |||
- uint16 bitspersample, samplesperpixel = 1; | |||
+ uint16 bitspersample = 1, samplesperpixel = 1; | |||
uint16 input_compression, input_photometric = PHOTOMETRIC_MINISBLACK; | |||
copyFunc cf; | |||
uint32 width, length; | |||
@@ -1067,6 +1067,16 @@ DECLAREcpFunc(cpContig2SeparateByRow) | |||
register uint32 n; | |||
uint32 row; | |||
tsample_t s; | |||
+ uint16 bps = 0; | |||
+ | |||
+ (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps); | |||
+ if( bps != 8 ) | |||
+ { | |||
+ TIFFError(TIFFFileName(in), | |||
+ "Error, can only handle BitsPerSample=8 in %s", | |||
+ "cpContig2SeparateByRow"); | |||
+ return 0; | |||
+ } | |||
inbuf = _TIFFmalloc(scanlinesizein); | |||
outbuf = _TIFFmalloc(scanlinesizeout); | |||
@@ -1120,6 +1130,16 @@ DECLAREcpFunc(cpSeparate2ContigByRow) | |||
register uint32 n; | |||
uint32 row; | |||
tsample_t s; | |||
+ uint16 bps = 0; | |||
+ | |||
+ (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps); | |||
+ if( bps != 8 ) | |||
+ { | |||
+ TIFFError(TIFFFileName(in), | |||
+ "Error, can only handle BitsPerSample=8 in %s", | |||
+ "cpSeparate2ContigByRow"); | |||
+ return 0; | |||
+ } | |||
inbuf = _TIFFmalloc(scanlinesizein); | |||
outbuf = _TIFFmalloc(scanlinesizeout); | |||
@@ -1784,7 +1804,7 @@ pickCopyFunc(TIFF* in, TIFF* out, uint16 bitspersample, uint16 samplesperpixel) | |||
uint32 w, l, tw, tl; | |||
int bychunk; | |||
- (void) TIFFGetField(in, TIFFTAG_PLANARCONFIG, &shortv); | |||
+ (void) TIFFGetFieldDefaulted(in, TIFFTAG_PLANARCONFIG, &shortv); | |||
if (shortv != config && bitspersample != 8 && samplesperpixel > 1) { | |||
fprintf(stderr, | |||
"%s: Cannot handle different planar configuration w/ bits/sample != 8\n", |
@ -0,0 +1,46 @@ | |||
From 47f2fb61a3a64667bce1a8398a8fcb1b348ff122 Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Wed, 11 Jan 2017 12:15:01 +0000 | |||
Subject: [PATCH] * libtiff/tif_jpeg.c: avoid integer division by zero in | |||
JPEGSetupEncode() when horizontal or vertical sampling is set to 0. Fixes | |||
http://bugzilla.maptools.org/show_bug.cgi?id=2653 | |||
--- | |||
ChangeLog | 6 ++++++ | |||
libtiff/tif_jpeg.c | 7 +++++++ | |||
2 files changed, 13 insertions(+) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index c82bc76..a7208f5 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,11 @@ | |||
2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ * libtiff/tif_jpeg.c: avoid integer division by zero in | |||
+ JPEGSetupEncode() when horizontal or vertical sampling is set to 0. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2653 | |||
+ | |||
+2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* tools/tiffcp.c: error out cleanly in cpContig2SeparateByRow and | |||
cpSeparate2ContigByRow if BitsPerSample != 8 to avoid heap based overflow. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2656 and | |||
diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c | |||
index 38595f9..6c17c38 100644 | |||
--- a/libtiff/tif_jpeg.c | |||
+++ b/libtiff/tif_jpeg.c | |||
@@ -1626,6 +1626,13 @@ JPEGSetupEncode(TIFF* tif) | |||
case PHOTOMETRIC_YCBCR: | |||
sp->h_sampling = td->td_ycbcrsubsampling[0]; | |||
sp->v_sampling = td->td_ycbcrsubsampling[1]; | |||
+ if( sp->h_sampling == 0 || sp->v_sampling == 0 ) | |||
+ { | |||
+ TIFFErrorExt(tif->tif_clientdata, module, | |||
+ "Invalig horizontal/vertical sampling value"); | |||
+ return (0); | |||
+ } | |||
+ | |||
/* | |||
* A ReferenceBlackWhite field *must* be present since the | |||
* default value is inappropriate for YCbCr. Fill in the |
@ -0,0 +1,60 @@ | |||
From 3cfd62d77c2a7e147a05bd678524c345fa9c2bb8 Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Wed, 11 Jan 2017 13:28:01 +0000 | |||
Subject: [PATCH] * libtiff/tif_dirread.c: avoid division by floating point 0 | |||
in TIFFReadDirEntryCheckedRational() and TIFFReadDirEntryCheckedSrational(), | |||
and return 0 in that case (instead of infinity as before presumably) | |||
Apparently some sanitizers do not like those divisions by zero. Fixes | |||
http://bugzilla.maptools.org/show_bug.cgi?id=2644 | |||
--- | |||
ChangeLog | 8 ++++++++ | |||
libtiff/tif_dirread.c | 10 ++++++++-- | |||
2 files changed, 16 insertions(+), 2 deletions(-) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 6a752cd..722a405 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,13 @@ | |||
2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ * libtiff/tif_dirread.c: avoid division by floating point 0 in | |||
+ TIFFReadDirEntryCheckedRational() and TIFFReadDirEntryCheckedSrational(), | |||
+ and return 0 in that case (instead of infinity as before presumably) | |||
+ Apparently some sanitizers do not like those divisions by zero. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2644 | |||
+ | |||
+2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* libtiff/tif_jpeg.c: avoid integer division by zero in | |||
JPEGSetupEncode() when horizontal or vertical sampling is set to 0. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2653 | |||
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c | |||
index 570d0c3..8a1e42a 100644 | |||
--- a/libtiff/tif_dirread.c | |||
+++ b/libtiff/tif_dirread.c | |||
@@ -2872,7 +2872,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedRational(TIFF* tif, TIFFD | |||
m.l = direntry->tdir_offset.toff_long8; | |||
if (tif->tif_flags&TIFF_SWAB) | |||
TIFFSwabArrayOfLong(m.i,2); | |||
- if (m.i[0]==0) | |||
+ /* Not completely sure what we should do when m.i[1]==0, but some */ | |||
+ /* sanitizers do not like division by 0.0: */ | |||
+ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */ | |||
+ if (m.i[0]==0 || m.i[1]==0) | |||
*value=0.0; | |||
else | |||
*value=(double)m.i[0]/(double)m.i[1]; | |||
@@ -2900,7 +2903,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedSrational(TIFF* tif, TIFF | |||
m.l=direntry->tdir_offset.toff_long8; | |||
if (tif->tif_flags&TIFF_SWAB) | |||
TIFFSwabArrayOfLong(m.i,2); | |||
- if ((int32)m.i[0]==0) | |||
+ /* Not completely sure what we should do when m.i[1]==0, but some */ | |||
+ /* sanitizers do not like division by 0.0: */ | |||
+ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */ | |||
+ if ((int32)m.i[0]==0 || m.i[1]==0) | |||
*value=0.0; | |||
else | |||
*value=(double)((int32)m.i[0])/(double)m.i[1]; |
@ -0,0 +1,298 @@ | |||
From 3144e57770c1e4d26520d8abee750f8ac8b75490 Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Wed, 11 Jan 2017 16:09:02 +0000 | |||
Subject: [PATCH] * libtiff/tif_dir.c, tif_dirread.c, tif_dirwrite.c: implement | |||
various clampings of double to other data types to avoid undefined behaviour | |||
if the output range isn't big enough to hold the input value. Fixes | |||
http://bugzilla.maptools.org/show_bug.cgi?id=2643 | |||
http://bugzilla.maptools.org/show_bug.cgi?id=2642 | |||
http://bugzilla.maptools.org/show_bug.cgi?id=2646 | |||
http://bugzilla.maptools.org/show_bug.cgi?id=2647 | |||
--- | |||
ChangeLog | 10 ++++++ | |||
libtiff/tif_dir.c | 18 +++++++--- | |||
libtiff/tif_dirread.c | 10 +++++- | |||
libtiff/tif_dirwrite.c | 90 ++++++++++++++++++++++++++++++++++++++++++++------ | |||
4 files changed, 113 insertions(+), 15 deletions(-) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 722a405..6517640 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,15 @@ | |||
2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ * libtiff/tif_dir.c, tif_dirread.c, tif_dirwrite.c: implement various clampings | |||
+ of double to other data types to avoid undefined behaviour if the output range | |||
+ isn't big enough to hold the input value. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2643 | |||
+ http://bugzilla.maptools.org/show_bug.cgi?id=2642 | |||
+ http://bugzilla.maptools.org/show_bug.cgi?id=2646 | |||
+ http://bugzilla.maptools.org/show_bug.cgi?id=2647 | |||
+ | |||
+2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* libtiff/tif_dirread.c: avoid division by floating point 0 in | |||
TIFFReadDirEntryCheckedRational() and TIFFReadDirEntryCheckedSrational(), | |||
and return 0 in that case (instead of infinity as before presumably) | |||
diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c | |||
index 68a55af..a04d28f 100644 | |||
--- a/libtiff/tif_dir.c | |||
+++ b/libtiff/tif_dir.c | |||
@@ -31,6 +31,7 @@ | |||
* (and also some miscellaneous stuff) | |||
*/ | |||
#include "tiffiop.h" | |||
+#include <float.h> | |||
/* | |||
* These are used in the backwards compatibility code... | |||
@@ -154,6 +155,15 @@ checkInkNamesString(TIFF* tif, uint32 slen, const char* s) | |||
return (0); | |||
} | |||
+static float TIFFClampDoubleToFloat( double val ) | |||
+{ | |||
+ if( val > FLT_MAX ) | |||
+ return FLT_MAX; | |||
+ if( val < -FLT_MAX ) | |||
+ return -FLT_MAX; | |||
+ return (float)val; | |||
+} | |||
+ | |||
static int | |||
_TIFFVSetField(TIFF* tif, uint32 tag, va_list ap) | |||
{ | |||
@@ -312,13 +322,13 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap) | |||
dblval = va_arg(ap, double); | |||
if( dblval < 0 ) | |||
goto badvaluedouble; | |||
- td->td_xresolution = (float) dblval; | |||
+ td->td_xresolution = TIFFClampDoubleToFloat( dblval ); | |||
break; | |||
case TIFFTAG_YRESOLUTION: | |||
dblval = va_arg(ap, double); | |||
if( dblval < 0 ) | |||
goto badvaluedouble; | |||
- td->td_yresolution = (float) dblval; | |||
+ td->td_yresolution = TIFFClampDoubleToFloat( dblval ); | |||
break; | |||
case TIFFTAG_PLANARCONFIG: | |||
v = (uint16) va_arg(ap, uint16_vap); | |||
@@ -327,10 +337,10 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap) | |||
td->td_planarconfig = (uint16) v; | |||
break; | |||
case TIFFTAG_XPOSITION: | |||
- td->td_xposition = (float) va_arg(ap, double); | |||
+ td->td_xposition = TIFFClampDoubleToFloat( va_arg(ap, double) ); | |||
break; | |||
case TIFFTAG_YPOSITION: | |||
- td->td_yposition = (float) va_arg(ap, double); | |||
+ td->td_yposition = TIFFClampDoubleToFloat( va_arg(ap, double) ); | |||
break; | |||
case TIFFTAG_RESOLUTIONUNIT: | |||
v = (uint16) va_arg(ap, uint16_vap); | |||
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c | |||
index 8a1e42a..77b0f37 100644 | |||
--- a/libtiff/tif_dirread.c | |||
+++ b/libtiff/tif_dirread.c | |||
@@ -40,6 +40,7 @@ | |||
*/ | |||
#include "tiffiop.h" | |||
+#include <float.h> | |||
#define IGNORE 0 /* tag placeholder used below */ | |||
#define FAILED_FII ((uint32) -1) | |||
@@ -2406,7 +2407,14 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryFloatArray(TIFF* tif, TIFFDirEnt | |||
ma=(double*)origdata; | |||
mb=data; | |||
for (n=0; n<count; n++) | |||
- *mb++=(float)(*ma++); | |||
+ { | |||
+ double val = *ma++; | |||
+ if( val > FLT_MAX ) | |||
+ val = FLT_MAX; | |||
+ else if( val < -FLT_MAX ) | |||
+ val = -FLT_MAX; | |||
+ *mb++=(float)val; | |||
+ } | |||
} | |||
break; | |||
} | |||
diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c | |||
index c9e871b..2967da5 100644 | |||
--- a/libtiff/tif_dirwrite.c | |||
+++ b/libtiff/tif_dirwrite.c | |||
@@ -30,6 +30,7 @@ | |||
* Directory Write Support Routines. | |||
*/ | |||
#include "tiffiop.h" | |||
+#include <float.h> | |||
#ifdef HAVE_IEEEFP | |||
#define TIFFCvtNativeToIEEEFloat(tif, n, fp) | |||
@@ -939,6 +940,69 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64* pdiroff) | |||
return(0); | |||
} | |||
+static float TIFFClampDoubleToFloat( double val ) | |||
+{ | |||
+ if( val > FLT_MAX ) | |||
+ return FLT_MAX; | |||
+ if( val < -FLT_MAX ) | |||
+ return -FLT_MAX; | |||
+ return (float)val; | |||
+} | |||
+ | |||
+static int8 TIFFClampDoubleToInt8( double val ) | |||
+{ | |||
+ if( val > 127 ) | |||
+ return 127; | |||
+ if( val < -128 || val != val ) | |||
+ return -128; | |||
+ return (int8)val; | |||
+} | |||
+ | |||
+static int16 TIFFClampDoubleToInt16( double val ) | |||
+{ | |||
+ if( val > 32767 ) | |||
+ return 32767; | |||
+ if( val < -32768 || val != val ) | |||
+ return -32768; | |||
+ return (int16)val; | |||
+} | |||
+ | |||
+static int32 TIFFClampDoubleToInt32( double val ) | |||
+{ | |||
+ if( val > 0x7FFFFFFF ) | |||
+ return 0x7FFFFFFF; | |||
+ if( val < -0x7FFFFFFF-1 || val != val ) | |||
+ return -0x7FFFFFFF-1; | |||
+ return (int32)val; | |||
+} | |||
+ | |||
+static uint8 TIFFClampDoubleToUInt8( double val ) | |||
+{ | |||
+ if( val < 0 ) | |||
+ return 0; | |||
+ if( val > 255 || val != val ) | |||
+ return 255; | |||
+ return (uint8)val; | |||
+} | |||
+ | |||
+static uint16 TIFFClampDoubleToUInt16( double val ) | |||
+{ | |||
+ if( val < 0 ) | |||
+ return 0; | |||
+ if( val > 65535 || val != val ) | |||
+ return 65535; | |||
+ return (uint16)val; | |||
+} | |||
+ | |||
+static uint32 TIFFClampDoubleToUInt32( double val ) | |||
+{ | |||
+ if( val < 0 ) | |||
+ return 0; | |||
+ if( val > 0xFFFFFFFFU || val != val ) | |||
+ return 0xFFFFFFFFU; | |||
+ return (uint32)val; | |||
+} | |||
+ | |||
static int | |||
TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, double* value) | |||
{ | |||
@@ -959,7 +1023,7 @@ TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* di | |||
if (tif->tif_dir.td_bitspersample<=32) | |||
{ | |||
for (i = 0; i < count; ++i) | |||
- ((float*)conv)[i] = (float)value[i]; | |||
+ ((float*)conv)[i] = TIFFClampDoubleToFloat(value[i]); | |||
ok = TIFFWriteDirectoryTagFloatArray(tif,ndir,dir,tag,count,(float*)conv); | |||
} | |||
else | |||
@@ -971,19 +1035,19 @@ TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* di | |||
if (tif->tif_dir.td_bitspersample<=8) | |||
{ | |||
for (i = 0; i < count; ++i) | |||
- ((int8*)conv)[i] = (int8)value[i]; | |||
+ ((int8*)conv)[i] = TIFFClampDoubleToInt8(value[i]); | |||
ok = TIFFWriteDirectoryTagSbyteArray(tif,ndir,dir,tag,count,(int8*)conv); | |||
} | |||
else if (tif->tif_dir.td_bitspersample<=16) | |||
{ | |||
for (i = 0; i < count; ++i) | |||
- ((int16*)conv)[i] = (int16)value[i]; | |||
+ ((int16*)conv)[i] = TIFFClampDoubleToInt16(value[i]); | |||
ok = TIFFWriteDirectoryTagSshortArray(tif,ndir,dir,tag,count,(int16*)conv); | |||
} | |||
else | |||
{ | |||
for (i = 0; i < count; ++i) | |||
- ((int32*)conv)[i] = (int32)value[i]; | |||
+ ((int32*)conv)[i] = TIFFClampDoubleToInt32(value[i]); | |||
ok = TIFFWriteDirectoryTagSlongArray(tif,ndir,dir,tag,count,(int32*)conv); | |||
} | |||
break; | |||
@@ -991,19 +1055,19 @@ TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* di | |||
if (tif->tif_dir.td_bitspersample<=8) | |||
{ | |||
for (i = 0; i < count; ++i) | |||
- ((uint8*)conv)[i] = (uint8)value[i]; | |||
+ ((uint8*)conv)[i] = TIFFClampDoubleToUInt8(value[i]); | |||
ok = TIFFWriteDirectoryTagByteArray(tif,ndir,dir,tag,count,(uint8*)conv); | |||
} | |||
else if (tif->tif_dir.td_bitspersample<=16) | |||
{ | |||
for (i = 0; i < count; ++i) | |||
- ((uint16*)conv)[i] = (uint16)value[i]; | |||
+ ((uint16*)conv)[i] = TIFFClampDoubleToUInt16(value[i]); | |||
ok = TIFFWriteDirectoryTagShortArray(tif,ndir,dir,tag,count,(uint16*)conv); | |||
} | |||
else | |||
{ | |||
for (i = 0; i < count; ++i) | |||
- ((uint32*)conv)[i] = (uint32)value[i]; | |||
+ ((uint32*)conv)[i] = TIFFClampDoubleToUInt32(value[i]); | |||
ok = TIFFWriteDirectoryTagLongArray(tif,ndir,dir,tag,count,(uint32*)conv); | |||
} | |||
break; | |||
@@ -2094,6 +2094,7 @@ TIFFWriteDirectoryTagCheckedSlong8Array( | |||
static int | |||
TIFFWriteDirectoryTagCheckedRational(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, double value) | |||
{ | |||
+ static const char module[] = "TIFFWriteDirectoryTagCheckedRational"; | |||
uint32 m[2]; | |||
assert(value>=0.0); | |||
assert(sizeof(uint32)==4); | |||
@@ -2102,7 +2102,12 @@ TIFFWriteDirectoryTagCheckedRational(TIF | |||
m[0]=0; | |||
m[1]=1; | |||
} | |||
- else if (value==(double)(uint32)value) | |||
+ else if( value != value ) | |||
+ { | |||
+ TIFFErrorExt(tif->tif_clientdata,module,"Not-a-number value is illegal"); | |||
+ return 0; | |||
+ } | |||
+ else if (value <= 0xFFFFFFFFU && value==(double)(uint32)value) | |||
{ | |||
m[0]=(uint32)value; | |||
m[1]=1; | |||
@@ -2143,12 +2212,13 @@ TIFFWriteDirectoryTagCheckedRationalArray(TIFF* tif, uint32* ndir, TIFFDirEntry* | |||
} | |||
for (na=value, nb=m, nc=0; nc<count; na++, nb+=2, nc++) | |||
{ | |||
- if (*na<=0.0) | |||
+ if (*na<=0.0 || *na != *na) | |||
{ | |||
nb[0]=0; | |||
nb[1]=1; | |||
} | |||
- else if (*na==(float)(uint32)(*na)) | |||
+ else if (*na >= 0 && *na <= (float)0xFFFFFFFFU && | |||
+ *na==(float)(uint32)(*na)) | |||
{ | |||
nb[0]=(uint32)(*na); | |||
nb[1]=1; |
@ -0,0 +1,46 @@ | |||
From 0a76a8c765c7b8327c59646284fa78c3c27e5490 Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Wed, 11 Jan 2017 16:13:50 +0000 | |||
Subject: [PATCH] * libtiff/tif_jpeg.c: validate BitsPerSample in | |||
JPEGSetupEncode() to avoid undefined behaviour caused by invalid shift | |||
exponent. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2648 | |||
--- | |||
ChangeLog | 6 ++++++ | |||
libtiff/tif_jpeg.c | 7 +++++++ | |||
2 files changed, 13 insertions(+) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 6517640..8e202a2 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,11 @@ | |||
2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ * libtiff/tif_jpeg.c: validate BitsPerSample in JPEGSetupEncode() to avoid | |||
+ undefined behaviour caused by invalid shift exponent. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2648 | |||
+ | |||
+2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* libtiff/tif_dir.c, tif_dirread.c, tif_dirwrite.c: implement various clampings | |||
of double to other data types to avoid undefined behaviour if the output range | |||
isn't big enough to hold the input value. | |||
diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c | |||
index 6c17c38..192989a 100644 | |||
--- a/libtiff/tif_jpeg.c | |||
+++ b/libtiff/tif_jpeg.c | |||
@@ -1632,6 +1632,13 @@ JPEGSetupEncode(TIFF* tif) | |||
"Invalig horizontal/vertical sampling value"); | |||
return (0); | |||
} | |||
+ if( td->td_bitspersample > 16 ) | |||
+ { | |||
+ TIFFErrorExt(tif->tif_clientdata, module, | |||
+ "BitsPerSample %d not allowed for JPEG", | |||
+ td->td_bitspersample); | |||
+ return (0); | |||
+ } | |||
/* | |||
* A ReferenceBlackWhite field *must* be present since the |
@ -0,0 +1,67 @@ | |||
From 66e7bd59520996740e4df5495a830b42fae48bc4 Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Wed, 11 Jan 2017 16:33:34 +0000 | |||
Subject: [PATCH] * libtiff/tif_read.c: avoid potential undefined behaviour on | |||
signed integer addition in TIFFReadRawStrip1() in isMapped() case. Fixes | |||
http://bugzilla.maptools.org/show_bug.cgi?id=2650 | |||
--- | |||
ChangeLog | 6 ++++++ | |||
libtiff/tif_read.c | 27 ++++++++++++++++++--------- | |||
2 files changed, 24 insertions(+), 9 deletions(-) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 8e202a2..3e31464 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,11 @@ | |||
2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ * libtiff/tif_read.c: avoid potential undefined behaviour on signed integer | |||
+ addition in TIFFReadRawStrip1() in isMapped() case. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2650 | |||
+ | |||
+2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* libtiff/tif_jpeg.c: validate BitsPerSample in JPEGSetupEncode() to avoid | |||
undefined behaviour caused by invalid shift exponent. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2648 | |||
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c | |||
index 52bbf50..b7aacbd 100644 | |||
--- a/libtiff/tif_read.c | |||
+++ b/libtiff/tif_read.c | |||
@@ -420,16 +420,25 @@ TIFFReadRawStrip1(TIFF* tif, uint32 strip, void* buf, tmsize_t size, | |||
return ((tmsize_t)(-1)); | |||
} | |||
} else { | |||
- tmsize_t ma,mb; | |||
+ tmsize_t ma; | |||
tmsize_t n; | |||
- ma=(tmsize_t)td->td_stripoffset[strip]; | |||
- mb=ma+size; | |||
- if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||(ma>tif->tif_size)) | |||
- n=0; | |||
- else if ((mb<ma)||(mb<size)||(mb>tif->tif_size)) | |||
- n=tif->tif_size-ma; | |||
- else | |||
- n=size; | |||
+ if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)|| | |||
+ ((ma=(tmsize_t)td->td_stripoffset[strip])>tif->tif_size)) | |||
+ { | |||
+ n=0; | |||
+ } | |||
+ else if( ma > TIFF_TMSIZE_T_MAX - size ) | |||
+ { | |||
+ n=0; | |||
+ } | |||
+ else | |||
+ { | |||
+ tmsize_t mb=ma+size; | |||
+ if (mb>tif->tif_size) | |||
+ n=tif->tif_size-ma; | |||
+ else | |||
+ n=size; | |||
+ } | |||
if (n!=size) { | |||
#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) | |||
TIFFErrorExt(tif->tif_clientdata, module, |
@ -0,0 +1,47 @@ | |||
From 48780b4fcc425cddc4ef8ffdf536f96a0d1b313b Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Wed, 11 Jan 2017 16:38:26 +0000 | |||
Subject: [PATCH] =?UTF-8?q?*=20libtiff/tif=5Fgetimage.c:=20add=20explicit?= | |||
=?UTF-8?q?=20uint32=20cast=20in=20putagreytile=20to=20avoid=20UndefinedBe?= | |||
=?UTF-8?q?haviorSanitizer=20warning.=20Patch=20by=20Nicol=C3=A1s=20Pe?= | |||
=?UTF-8?q?=C3=B1a.=20Fixes=20http://bugzilla.maptools.org/show=5Fbug.cgi?= | |||
=?UTF-8?q?=3Fid=3D2658?= | |||
MIME-Version: 1.0 | |||
Content-Type: text/plain; charset=UTF-8 | |||
Content-Transfer-Encoding: 8bit | |||
--- | |||
ChangeLog | 7 +++++++ | |||
libtiff/tif_getimage.c | 2 +- | |||
2 files changed, 8 insertions(+), 1 deletion(-) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 3e31464..6a342e5 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,12 @@ | |||
2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ * libtiff/tif_getimage.c: add explicit uint32 cast in putagreytile to | |||
+ avoid UndefinedBehaviorSanitizer warning. | |||
+ Patch by Nicolás Peña. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2658 | |||
+ | |||
+2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* libtiff/tif_read.c: avoid potential undefined behaviour on signed integer | |||
addition in TIFFReadRawStrip1() in isMapped() case. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2650 | |||
diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c | |||
index fed31f1..2fa1775 100644 | |||
--- a/libtiff/tif_getimage.c | |||
+++ b/libtiff/tif_getimage.c | |||
@@ -1305,7 +1305,7 @@ DECLAREContigPutFunc(putagreytile) | |||
while (h-- > 0) { | |||
for (x = w; x-- > 0;) | |||
{ | |||
- *cp++ = BWmap[*pp][0] & (*(pp+1) << 24 | ~A1); | |||
+ *cp++ = BWmap[*pp][0] & ((uint32)*(pp+1) << 24 | ~A1); | |||
pp += samplesperpixel; | |||
} | |||
cp += toskew; |
@ -0,0 +1,101 @@ | |||
From d60332057b9575ada4f264489582b13e30137be1 Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Wed, 11 Jan 2017 19:02:49 +0000 | |||
Subject: [PATCH] * libtiff/tiffiop.h, tif_unix.c, tif_win32.c, tif_vms.c: add | |||
_TIFFcalloc() | |||
* libtiff/tif_read.c: TIFFReadBufferSetup(): use _TIFFcalloc() to zero | |||
initialize tif_rawdata. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2651 | |||
--- | |||
ChangeLog | 8 ++++++++ | |||
libtiff/tif_read.c | 4 +++- | |||
libtiff/tif_unix.c | 8 ++++++++ | |||
libtiff/tif_vms.c | 8 ++++++++ | |||
libtiff/tif_win32.c | 8 ++++++++ | |||
libtiff/tiffio.h | 1 + | |||
6 files changed, 36 insertions(+), 1 deletion(-) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 6a342e5..abd75d7 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,5 +1,13 @@ | |||
2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ * libtiff/tiffiop.h, tif_unix.c, tif_win32.c, tif_vms.c: add _TIFFcalloc() | |||
+ | |||
+ * libtiff/tif_read.c: TIFFReadBufferSetup(): use _TIFFcalloc() to zero | |||
+ initialize tif_rawdata. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2651 | |||
+ | |||
+2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
* libtiff/tif_getimage.c: add explicit uint32 cast in putagreytile to | |||
avoid UndefinedBehaviorSanitizer warning. | |||
Patch by Nicolás Peña. | |||
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c | |||
index 277fdd6..4535ccb 100644 | |||
--- a/libtiff/tif_read.c | |||
+++ b/libtiff/tif_read.c | |||
@@ -985,7 +985,9 @@ TIFFReadBufferSetup(TIFF* tif, void* bp, tmsize_t size) | |||
"Invalid buffer size"); | |||
return (0); | |||
} | |||
- tif->tif_rawdata = (uint8*) _TIFFmalloc(tif->tif_rawdatasize); | |||
+ /* Initialize to zero to avoid uninitialized buffers in case of */ | |||
+ /* short reads (http://bugzilla.maptools.org/show_bug.cgi?id=2651) */ | |||
+ tif->tif_rawdata = (uint8*) _TIFFcalloc(1, tif->tif_rawdatasize); | |||
tif->tif_flags |= TIFF_MYBUFFER; | |||
} | |||
if (tif->tif_rawdata == NULL) { | |||
diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c | |||
index 7c7bc96..89dd32e 100644 | |||
--- a/libtiff/tif_unix.c | |||
+++ b/libtiff/tif_unix.c | |||
@@ -316,6 +316,14 @@ _TIFFmalloc(tmsize_t s) | |||
return (malloc((size_t) s)); | |||
} | |||
+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz) | |||
+{ | |||
+ if( nmemb == 0 || siz == 0 ) | |||
+ return ((void *) NULL); | |||
+ | |||
+ return calloc((size_t) nmemb, (size_t)siz); | |||
+} | |||
+ | |||
void | |||
_TIFFfree(void* p) | |||
{ | |||
diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c | |||
index d730b3a..3e9001b 100644 | |||
--- a/libtiff/tif_win32.c | |||
+++ b/libtiff/tif_win32.c | |||
@@ -360,6 +360,14 @@ _TIFFmalloc(tmsize_t s) | |||
return (malloc((size_t) s)); | |||
} | |||
+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz) | |||
+{ | |||
+ if( nmemb == 0 || siz == 0 ) | |||
+ return ((void *) NULL); | |||
+ | |||
+ return calloc((size_t) nmemb, (size_t)siz); | |||
+} | |||
+ | |||
void | |||
_TIFFfree(void* p) | |||
{ | |||
diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h | |||
index 732da17..fbd9171 100644 | |||
--- a/libtiff/tiffio.h | |||
+++ b/libtiff/tiffio.h | |||
@@ -293,6 +293,7 @@ extern TIFFCodec* TIFFGetConfiguredCODECs(void); | |||
*/ | |||
extern void* _TIFFmalloc(tmsize_t s); | |||
+extern void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz); | |||
extern void* _TIFFrealloc(void* p, tmsize_t s); | |||
extern void _TIFFmemset(void* p, int v, tmsize_t c); | |||
extern void _TIFFmemcpy(void* d, const void* s, tmsize_t c); |
@ -0,0 +1,46 @@ | |||
From 8283e4d1b7e53340684d12932880cbcbaf23a8c1 Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Thu, 12 Jan 2017 17:43:25 +0000 | |||
Subject: [PATCH] =?UTF-8?q?*=20libtiff/tif=5Fojpeg.c:=20fix=20leak=20in=20?= | |||
=?UTF-8?q?OJPEGReadHeaderInfoSecTablesAcTable=20when=20read=20fails.=20Pa?= | |||
=?UTF-8?q?tch=20by=20Nicol=C3=A1s=20Pe=C3=B1a.=20Fixes=20http://bugzilla.?= | |||
=?UTF-8?q?maptools.org/show=5Fbug.cgi=3Fid=3D2659?= | |||
MIME-Version: 1.0 | |||
Content-Type: text/plain; charset=UTF-8 | |||
Content-Transfer-Encoding: 8bit | |||
--- | |||
ChangeLog | 7 +++++++ | |||
libtiff/tif_ojpeg.c | 3 +++ | |||
2 files changed, 10 insertions(+) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 6e6f3b0..12e0370 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,3 +1,10 @@ | |||
+2017-01-12 Even Rouault <even.rouault at spatialys.com> | |||
+ | |||
+ * libtiff/tif_ojpeg.c: fix leak in OJPEGReadHeaderInfoSecTablesAcTable | |||
+ when read fails. | |||
+ Patch by Nicolás Peña. | |||
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2659 | |||
+ | |||
2017-01-11 Even Rouault <even.rouault at spatialys.com> | |||
* libtiff/tiffiop.h, tif_unix.c, tif_win32.c, tif_vms.c: add _TIFFcalloc() | |||
diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c | |||
index f19e8fd..b92f0eb 100644 | |||
--- a/libtiff/tif_ojpeg.c | |||
+++ b/libtiff/tif_ojpeg.c | |||
@@ -1918,7 +1918,10 @@ OJPEGReadHeaderInfoSecTablesAcTable(TIFF* tif) | |||
rb[sizeof(uint32)+5+n]=o[n]; | |||
p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); | |||
if (p!=q) | |||
+ { | |||
+ _TIFFfree(rb); | |||
return(0); | |||
+ } | |||
sp->actable[m]=rb; | |||
sp->sos_tda[m]=(sp->sos_tda[m]|m); | |||
} |
@ -0,0 +1,51 @@ | |||
From 2ea32f7372b65c24b2816f11c04bf59b5090d05b Mon Sep 17 00:00:00 2001 | |||
From: erouault <erouault> | |||
Date: Thu, 12 Jan 2017 19:23:20 +0000 | |||
Subject: [PATCH] * libtiff/tif_ojpeg.c: fix leak in | |||
OJPEGReadHeaderInfoSecTablesQTable, OJPEGReadHeaderInfoSecTablesDcTable and | |||
OJPEGReadHeaderInfoSecTablesAcTable | |||
--- | |||
ChangeLog | 3 ++- | |||
libtiff/tif_ojpeg.c | 6 ++++++ | |||
2 files changed, 8 insertions(+), 1 deletion(-) | |||
diff --git a/ChangeLog b/ChangeLog | |||
index 12e0370..cd2fa17 100644 | |||
--- a/ChangeLog | |||
+++ b/ChangeLog | |||
@@ -1,6 +1,7 @@ | |||
2017-01-12 Even Rouault <even.rouault at spatialys.com> | |||
- * libtiff/tif_ojpeg.c: fix leak in OJPEGReadHeaderInfoSecTablesAcTable | |||
+ * libtiff/tif_ojpeg.c: fix leak in OJPEGReadHeaderInfoSecTablesQTable, | |||
+ OJPEGReadHeaderInfoSecTablesDcTable and OJPEGReadHeaderInfoSecTablesAcTable | |||
when read fails. | |||
Patch by Nicolás Peña. | |||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2659 | |||
diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c | |||
index b92f0eb..5f6c684 100644 | |||
--- a/libtiff/tif_ojpeg.c | |||
+++ b/libtiff/tif_ojpeg.c | |||
@@ -1790,7 +1790,10 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif) | |||
TIFFSeekFile(tif,sp->qtable_offset[m],SEEK_SET); | |||
p=(uint32)TIFFReadFile(tif,&ob[sizeof(uint32)+5],64); | |||
if (p!=64) | |||
+ { | |||
+ _TIFFfree(ob); | |||
return(0); | |||
+ } | |||
sp->qtable[m]=ob; | |||
sp->sof_tq[m]=m; | |||
} | |||
@@ -1854,7 +1857,10 @@ OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif) | |||
rb[sizeof(uint32)+5+n]=o[n]; | |||
p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); | |||
if (p!=q) | |||
+ { | |||
+ _TIFFfree(rb); | |||
return(0); | |||
+ } | |||
sp->dctable[m]=rb; | |||
sp->sos_tda[m]=(m<<4); | |||
} |