From 928f0b0b2881ac32b32d9e165e88e3c9aed0fb9c Mon Sep 17 00:00:00 2001 From: Even Rouault 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 | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c index 2ea838556732..52a2402f7171 100644 --- a/libtiff/tif_getimage.c +++ b/libtiff/tif_getimage.c @@ -1302,7 +1302,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; -- 2.12.0