You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
67 lines
2.3 KiB
67 lines
2.3 KiB
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,
|