Fix python-pillow#6652: Handle translucent color used in RGB ImagePal…

…lete
bigcat88 · Oct 9, 2022 · f9a3178 · f9a3178
1 parent 243402e
commit f9a3178
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Tests/test_imagepalette.py b/Tests/test_imagepalette.py
@@ -50,6 +50,15 @@ def test_getcolor():
         palette.getcolor("unknown")
 
 
+def test_getcolor_raises_on_incompatible_color():
+    palette = ImagePalette.ImagePalette(mode="RGB")
+    # Opaque RGBA colors should work
+    palette.getcolor((0, 0, 0, 255))
+    assert palette.getcolor((0, 0, 0)) == palette.getcolor((0, 0, 0, 255))
+    with pytest.raises(ValueError):
+        palette.getcolor((0, 0, 0, 128))
+
+
 @pytest.mark.parametrize(
     "index, palette",
     [

diff --git a/src/PIL/ImagePalette.py b/src/PIL/ImagePalette.py
@@ -114,9 +114,13 @@ def getcolor(self, color, image=None):
         if self.rawmode:
             raise ValueError("palette contains raw palette data")
         if isinstance(color, tuple):
-            if self.mode == "RGB":
-                if len(color) == 4 and color[3] == 255:
+            if self.mode == "RGB" and len(color) == 4:
+                if color[3] == 255:
                     color = color[:3]
+                else:
+                    raise ValueError(
+                        "RGB ImagePalette can't handle non-opaque RGBA colors"
+                    )
             elif self.mode == "RGBA":
                 if len(color) == 3:
                     color += (255,)