From 6dcbf5bd96b717c58d7b642949da8d323099928e Mon Sep 17 00:00:00 2001
From: Eric Soroos <eric-github@soroos.net>
Date: Thu, 14 Jan 2016 04:59:19 -0800
Subject: [PATCH] Fix for buffer overflow in TiffDecode.c CVE-2016-0740

---
 Tests/check_libtiff_segfault.py   |  23 +++++++++++++++++++++++
 Tests/images/libtiff_segfault.tif | Bin 0 -> 262 bytes
 libImaging/TiffDecode.c           |   2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 Tests/check_libtiff_segfault.py
 create mode 100644 Tests/images/libtiff_segfault.tif

diff --git a/Tests/check_libtiff_segfault.py b/Tests/check_libtiff_segfault.py
new file mode 100644
index 00000000000..898a165d44a
--- /dev/null
+++ b/Tests/check_libtiff_segfault.py
@@ -0,0 +1,23 @@
+from helper import unittest, PillowTestCase
+from PIL import Image
+
+TEST_FILE = "Tests/images/libtiff_segfault.tif"
+
+class TestLibtiffSegfault(PillowTestCase):
+    def test_segfault(self):
+        """ This test should not segfault. It will on Pillow <= 3.1.0 and
+            libtiff >= 4.0.0
+            """
+
+        try:
+            im = Image.open(TEST_FILE)
+            im.load()
+        except IOError:
+            self.assertTrue(True, "Got expected IOError")
+        except Exception:
+            self.fail("Should have returned IOError")
+
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/Tests/images/libtiff_segfault.tif b/Tests/images/libtiff_segfault.tif
new file mode 100644
index 0000000000000000000000000000000000000000..8665e5f2bb9372183a72f4f173771f64e66bd421
GIT binary patch
literal 262
zcmebD)MDUZU|`^7U|?isU<9)M{|7Rm>=tGQ1|}#Qq>35J-qgUrzy@W5^l%}u1sPeu
z=BxvX3n7V%LfIhm#h`2rpc-+g`UoIf21$J|5*sMRaDkDLp<>S4gN#6@G8|g4=6(Dj
SIX;j9lz<0k8H}E8Z2$mZF%<j&

literal 0
HcmV?d00001

diff --git a/libImaging/TiffDecode.c b/libImaging/TiffDecode.c
index 25336e7fabb..32d8441031a 100644
--- a/libImaging/TiffDecode.c
+++ b/libImaging/TiffDecode.c
@@ -169,7 +169,7 @@ int ImagingLibTiffDecode(Imaging im, ImagingCodecState state, UINT8* buffer, int
 	char *filename = "tempfile.tif";
 	char *mode = "r";
 	TIFF *tiff;
-	int size;
+	tsize_t size;
 
 
 	/* buffer is the encoded file, bytes is the length of the encoded file */