Merge pull request #3771 from radarhere/app13

Fixed reading APP13 marker without Photoshop data
python-pillow · May 4, 2019 · 0ccd887 · 0ccd887
2 parents 82d9ea5 + 2274c2a
commit 0ccd887
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Tests/images/app13.jpg b/Tests/images/app13.jpg
diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py
@@ -620,6 +620,10 @@ def test_photoshop(self):
             'DisplayedUnitsY': 1,
         })
 
+        # This image does not contain a Photoshop header string
+        im = Image.open("Tests/images/app13.jpg")
+        self.assertNotIn("photoshop", im.info)
+
 
 @unittest.skipUnless(sys.platform.startswith('win32'), "Windows only")
 class TestFileCloseW32(PillowTestCase):

diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py
@@ -136,7 +136,7 @@ def APP(self, marker):
                 offset = offset + size
                 if offset & 1:
                     offset += 1
-        self.info["photoshop"] = photoshop
+            self.info["photoshop"] = photoshop
     elif marker == 0xFFEE and s[:5] == b"Adobe":
         self.info["adobe"] = i16(s, 5)
         # extract Adobe custom properties