unsupported modes

python-pillow · homm · Dec 27, 2019 · Nov 24, 2019 · Nov 24, 2019 · Nov 25, 2019
commit 1d1f3be27acd50fc4b8184707d7f6223a3fde97f
diff --git a/Tests/test_image_reduce.py b/Tests/test_image_reduce.py
@@ -32,6 +32,19 @@ def test_args(self):
        with self.assertRaises(ValueError):
            im.reduce((0, 10))

+    def test_unsupported_modes(self):
+        im = Image.new("P", (10, 10))
+        with self.assertRaises(ValueError):
+            im.reduce(3)
+
+        im = Image.new("1", (10, 10))
+        with self.assertRaises(ValueError):
+            im.reduce(3)
+
+        im = Image.new("I;16", (10, 10))
+        with self.assertRaises(ValueError):
+            im.reduce(3)
+
    def get_image(self, mode):
        bands = [self.gradients_image]
        for _ in ImageMode.getmode(mode).bands[1:]:

diff --git a/src/libImaging/Reduce.c b/src/libImaging/Reduce.c
@@ -963,6 +963,12 @@ ImagingReduce(Imaging imIn, int xscale, int yscale)
    ImagingSectionCookie cookie;
    Imaging imOut = NULL;

+    if (strcmp(imIn->mode, "P") == 0 || strcmp(imIn->mode, "1") == 0)
+        return (Imaging) ImagingError_ModeError();
+
+    if (imIn->type == IMAGING_TYPE_SPECIAL)
+        return (Imaging) ImagingError_ModeError();
+
    imOut = ImagingNewDirty(imIn->mode,
                            (imIn->xsize + xscale - 1) / xscale,
                            (imIn->ysize + yscale - 1) / yscale);