Changed raw decode buffer size to unsigned int

python-pillow · Apr 13, 2019 · bcbd3ec · bcbd3ec
1 parent ee063af
commit bcbd3ec
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Tests/check_large_memory.py b/Tests/check_large_memory.py
@@ -12,6 +12,12 @@
 # 2.7 and 3.2.
 
 from PIL import Image
+
+try:
+    import numpy
+except ImportError:
+    numpy = None
+
 YDIM = 32769
 XDIM = 48000
 
@@ -32,6 +38,11 @@ def test_2gpx(self):
         """failed prepatch"""
         self._write_png(XDIM, XDIM)
 
+    @unittest.skipIf(numpy is None, "Numpy is not installed")
+    def test_size_greater_than_int(self):
+        arr = numpy.ndarray(shape=(16394, 16394))
+        Image.fromarray(arr)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/src/libImaging/Imaging.h b/src/libImaging/Imaging.h
@@ -464,7 +464,7 @@ extern int ImagingPcxDecode(Imaging im, ImagingCodecState state,
 extern int ImagingPcxEncode(Imaging im, ImagingCodecState state,
                             UINT8* buffer, int bytes);
 extern int ImagingRawDecode(Imaging im, ImagingCodecState state,
-                            UINT8* buffer, int bytes);
+                            UINT8* buffer, unsigned int bytes);
 extern int ImagingRawEncode(Imaging im, ImagingCodecState state,
                             UINT8* buffer, int bytes);
 extern int ImagingSgiRleDecode(Imaging im, ImagingCodecState state,

diff --git a/src/libImaging/RawDecode.c b/src/libImaging/RawDecode.c
@@ -20,7 +20,7 @@
 
 
 int
-ImagingRawDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
+ImagingRawDecode(Imaging im, ImagingCodecState state, UINT8* buf, unsigned int bytes)
 {
     enum { LINE = 1, SKIP };
     RAWSTATE* rawstate = state->context;