From bb5a090f60ed08941e5bdd7077f9a53caec99b57 Mon Sep 17 00:00:00 2001
From: Mikhail Iurkov <mikhail.iurkov@uploadcare.com>
Date: Wed, 9 Feb 2022 16:16:33 +0300
Subject: [PATCH] Drop excess values in BITSPERSAMPLE

---
 Tests/images/tiff_wrong_bits_per_sample_2.tiff | Bin 0 -> 1041 bytes
 Tests/test_file_tiff.py                        |  14 +++++++++-----
 src/PIL/TiffImagePlugin.py                     |   8 ++++++--
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 Tests/images/tiff_wrong_bits_per_sample_2.tiff

diff --git a/Tests/images/tiff_wrong_bits_per_sample_2.tiff b/Tests/images/tiff_wrong_bits_per_sample_2.tiff
new file mode 100644
index 0000000000000000000000000000000000000000..d44176ce76ce43f738cf215db0b7974fe3e3ff2a
GIT binary patch
literal 1041
zcmebD)MDUZW*BkcKPmwFA1DAJAu^B<fvbXZAq<F0IEf~Rl?yi?E{k6~Ts?#V(FJi2
z+ypc!{05@Q!p(=9hNb{neAu%E85kIu85n{76aZpIBsLR}%>opA1<WPPP;rntHYl43
z$mU~YVh{q--+*ca8Ck&QZ~*y2Na{tQY*1zsgR&cdY;mZ12B3r#BP&?%Eg)MO%6<f7
z%OIH}3$%+9sE-5aC=IAM$PK|jHpuJ`AOZ+<fQ|&Y6Gn3|fFL6nIv1rTmZYXAlxLP?
UD7bt21~8=M=j)YZrlm0e0COaFApigX

literal 0
HcmV?d00001

diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py
index 5801e1766..fd526089a 100644
--- a/Tests/test_file_tiff.py
+++ b/Tests/test_file_tiff.py
@@ -90,11 +90,15 @@ class TestFileTiff:
 
             assert_image_similar_tofile(im, "Tests/images/pil136.png", 1)
 
-    def test_wrong_bits_per_sample(self):
-        with Image.open("Tests/images/tiff_wrong_bits_per_sample.tiff") as im:
-            assert im.mode == "RGBA"
-            assert im.size == (52, 53)
-            assert im.tile == [("raw", (0, 0, 52, 53), 160, ("RGBA", 0, 1))]
+    @pytest.mark.parametrize("file_name,mode,w,h,offset", [
+        ("tiff_wrong_bits_per_sample.tiff","RGBA",52,53,160),
+        ("tiff_wrong_bits_per_sample_2.tiff","RGB",16,16,8),
+    ])
+    def test_wrong_bits_per_sample(self, file_name, mode, w, h, offset):
+        with Image.open("Tests/images/" + file_name) as im:
+            assert im.mode == mode
+            assert im.size == (w, h)
+            assert im.tile == [("raw", (0, 0, w, h), offset, (mode, 0, 1))]
             im.load()
 
     def test_set_legacy_api(self):
diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py
index e54082fec..307a08cea 100644
--- a/src/PIL/TiffImagePlugin.py
+++ b/src/PIL/TiffImagePlugin.py
@@ -1308,8 +1308,12 @@ class TiffImageFile(ImageFile.ImageFile):
             bps_count = 1
         bps_count += len(extra_tuple)
         # Some files have only one value in bps_tuple,
-        # while should have more. Fix it
-        if bps_count > len(bps_tuple) and len(bps_tuple) == 1:
+        # while should have more. Or have more values
+        # than expected. Fix it
+        bps_actual_count = len(bps_tuple)
+        if bps_count < bps_actual_count:
+            bps_tuple = bps_tuple[:bps_count]
+        elif bps_count > bps_actual_count and bps_actual_count == 1:
             bps_tuple = bps_tuple * bps_count
 
         samplesPerPixel = self.tag_v2.get(