summaryrefslogtreecommitdiff
path: root/third_party/libtiff/tif_getimage.c
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-01-11 17:18:01 -0500
committerChromium commit bot <commit-bot@chromium.org>2017-01-12 15:19:50 +0000
commite7fb8eb3e9f220a5f0c852f0238ab8d536a8bc9d (patch)
tree764c9b657b2e646e5dadba5b31f676f21fc4a780 /third_party/libtiff/tif_getimage.c
parentffdfbb9ec274785e01dbdb64e9eef624fc1fb2e4 (diff)
downloadpdfium-e7fb8eb3e9f220a5f0c852f0238ab8d536a8bc9d.tar.xz
Prevent undefined shift in putagreytile
Patch has been accepted upstream, see: http://bugzilla.maptools.org/show_bug.cgi?id=2658 BUG=655008 Change-Id: I7ef69e6f71e66bd7e0a4d334c4f8e60ed02213d2 Reviewed-on: https://pdfium-review.googlesource.com/2174 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'third_party/libtiff/tif_getimage.c')
-rw-r--r--third_party/libtiff/tif_getimage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/libtiff/tif_getimage.c b/third_party/libtiff/tif_getimage.c
index 1cf6ac6b45..2861cdd1e2 100644
--- a/third_party/libtiff/tif_getimage.c
+++ b/third_party/libtiff/tif_getimage.c
@@ -1281,7 +1281,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;