Merge pull request #1337 from homm/extraneous-jpeg-bytes

Skip any number extraneous chars at the end of JPEG chunks
2024-11-10 19:56:47 +03:00 · 2015-09-10 15:39:55 +01:00 · 2015-09-10 15:39:55 +01:00 · 60f44f2dce
commit 60f44f2dce
parent c8e570b08e 0b19a86087
2 changed files with 2 additions and 2 deletions
--- a/PIL/JpegImagePlugin.py
+++ b/PIL/JpegImagePlugin.py
@ -288,7 +288,7 @@ class JpegImageFile(ImageFile.ImageFile):

        s = self.fp.read(1)

-        if i8(s[0]) != 255:
+        if i8(s) != 255:
            raise SyntaxError("not a JPEG file")

        # Create attributes
@ -311,7 +311,7 @@ class JpegImageFile(ImageFile.ImageFile):
                i = i16(s)
            else:
                # Skip non-0xFF junk
-                s = b"\xff"
+                s = self.fp.read(1)
                continue

            if i in MARKER:
--- a/Tests/images/junk_jpeg_header.jpg
+++ b/Tests/images/junk_jpeg_header.jpg