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

Merge pull request #1991 from kkopachev/png-crc-error-ignore

Browse Source 
Ability to skip crc checks for ancillary chunks
This commit is contained in:
Alexander Karpinsky 2016-06-30 17:25:04 +04:00 committed by GitHub
commit 639bdd3c02
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PIL/PngImagePlugin.py
View File

@ -138,6 +138,12 @@ class ChunkStream(object):
def crc(self, cid, data): def crc(self, cid, data):
"Read and verify checksum" "Read and verify checksum"
# Skip CRC checks for ancillary chunks if allowed to load truncated images
# 5th byte of first char is 1 [specs, section 5.4]
if ImageFile.LOAD_TRUNCATED_IMAGES and (i8(cid[0]) >> 5 & 1):
self.crc_skip(cid, data)
return
try: try:
crc1 = Image.core.crc32(data, Image.core.crc32(cid)) crc1 = Image.core.crc32(data, Image.core.crc32(cid))
crc2 = i16(self.fp.read(2)), i16(self.fp.read(2)) crc2 = i16(self.fp.read(2)), i16(self.fp.read(2))

28
Tests/test_file_png.py
View File

@ -3,6 +3,7 @@ from helper import unittest, PillowTestCase, hopper
from io import BytesIO from io import BytesIO
from PIL import Image from PIL import Image
from PIL import ImageFile
from PIL import PngImagePlugin from PIL import PngImagePlugin
import zlib import zlib
@ -319,6 +320,33 @@ class TestFilePng(PillowTestCase):
self.assertTrue(im.fp is not None) self.assertTrue(im.fp is not None)
self.assertRaises((IOError, SyntaxError), im.verify) self.assertRaises((IOError, SyntaxError), im.verify)
def test_verify_ignores_crc_error(self):
# check ignores crc errors in ancillary chunks
chunk_data = chunk(b'tEXt', b'spam')
broken_crc_chunk_data = chunk_data[:-1] + b'q' # break CRC
image_data = HEAD + broken_crc_chunk_data + TAIL
self.assertRaises(SyntaxError, PngImagePlugin.PngImageFile, BytesIO(image_data))
ImageFile.LOAD_TRUNCATED_IMAGES = True
try:
im = load(image_data)
self.assertTrue(im is not None)
finally:
ImageFile.LOAD_TRUNCATED_IMAGES = False
def test_verify_not_ignores_crc_error_in_required_chunk(self):
# check does not ignore crc errors in required chunks
image_data = MAGIC + IHDR[:-1] + b'q' + TAIL
ImageFile.LOAD_TRUNCATED_IMAGES = True
try:
self.assertRaises(SyntaxError, PngImagePlugin.PngImageFile, BytesIO(image_data))
finally:
ImageFile.LOAD_TRUNCATED_IMAGES = False
def test_roundtrip_dpi(self): def test_roundtrip_dpi(self):
# Check dpi roundtripping # Check dpi roundtripping