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.
47 lines
1.7 KiB
47 lines
1.7 KiB
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;
|