Merge pull request #4613 from uploadcare/jpeg-icc-after-SOF

JPEG: Truncate icclist instead of setting to None

Author: radarhere

Tests/images/icc-after-SOF.jpg

@@ -689,6 +689,10 @@ def test_photoshop_malformed_and_multiple(self):
             apps_13_lengths = [len(v) for k, v in im.applist if k == "APP13"]
             assert [65504, 24] == apps_13_lengths
 
+    def test_icc_after_SOF(self):
+        with Image.open("Tests/images/icc-after-SOF.jpg") as im:
+            assert im.info["icc_profile"] == b"profile"
+
 
 @pytest.mark.skipif(not is_win32(), reason="Windows only")
 @skip_unless_feature("jpg")

Tests/test_file_jpeg.py

@@ -221,7 +221,7 @@ def SOF(self, marker):
         else:
             icc_profile = None  # wrong number of fragments
         self.info["icc_profile"] = icc_profile
-        self.icclist = None
+        self.icclist = []
 
     for i in range(6, len(s), 3):
         t = s[i : i + 3]