python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-12 02:06:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle IDAT chunks after image end

Browse Source
This commit is contained in:
Andrew Murray 2019-01-03 19:13:19 +11:00
parent 41fba67fb0
commit ea2a0e4654
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/hopper_idat_after_image_end.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 59 KiB

4
Tests/test_file_png.py
View File

@ -585,6 +585,10 @@ class TestFilePng(PillowTestCase):
self.assertIsInstance(im.text, dict) self.assertIsInstance(im.text, dict)
ImageFile.LOAD_TRUNCATED_IMAGES = False ImageFile.LOAD_TRUNCATED_IMAGES = False
# Raises an EOFError in load_end
im = Image.open("Tests/images/hopper_idat_after_image_end.png")
self.assertEqual(im.text, {'TXT': 'VALUE', 'ZIP': 'VALUE'})
@unittest.skipUnless(HAVE_WEBP and _webp.HAVE_WEBPANIM, @unittest.skipUnless(HAVE_WEBP and _webp.HAVE_WEBPANIM,
"WebP support not installed with animation") "WebP support not installed with animation")
def test_apng(self): def test_apng(self):

2
src/PIL/PngImagePlugin.py
View File

@ -677,6 +677,8 @@ class PngImageFile(ImageFile.ImageFile):
self.png.call(cid, pos, length) self.png.call(cid, pos, length)
except UnicodeDecodeError: except UnicodeDecodeError:
break break
except EOFError:
ImageFile._safe_read(self.fp, length)
self._text = self.png.im_text self._text = self.png.im_text
self.png.close() self.png.close()
self.png = None self.png = None