python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-27 09:44:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Discard first byte if not 0xFF (for issue #630)

Browse Source
This commit is contained in:
hugovk 2014-05-05 22:09:57 +03:00
parent 73eafbb55f
commit e835dd70a1
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PIL/JpegImagePlugin.py
View File

@ -290,9 +290,14 @@ class JpegImageFile(ImageFile.ImageFile):
while True:
i = i8(s)
if i == 0xFF:
s = s + self.fp.read(1)
i = i16(s)
else:
# Skip non-0xFF junk
s = "\xff"
continue
if i in MARKER:
name, description, handler = MARKER[i]
@ -307,7 +312,7 @@ class JpegImageFile(ImageFile.ImageFile):
# self.__offset = self.fp.tell()
break
s = self.fp.read(1)
elif i == 0 or i == 65535:
elif i == 0 or i == 0xFFFF:
# padded marker or junk; move on
s = "\xff"
else: