python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-17 10:44:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 48e12e04de into f4b81d6b7e

Browse Source
This commit is contained in:
Hugo 2016-08-31 07:00:08 +00:00 committed by GitHub
commit 157536a75d
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PIL/Image.py
View File

@ -2033,6 +2033,8 @@ def new(mode, size, color=0):
:returns: An :py:class:`~PIL.Image.Image` object. :returns: An :py:class:`~PIL.Image.Image` object.
""" """
_decompression_bomb_check(size)
if color is None: if color is None:
# don't initialize # don't initialize
return Image()._new(core.new(mode, size)) return Image()._new(core.new(mode, size))

12
Tests/test_decompression_bomb.py
View File

@ -39,5 +39,17 @@ class TestDecompressionBomb(PillowTestCase):
Image.DecompressionBombWarning, Image.DecompressionBombWarning,
lambda: Image.open(TEST_FILE)) lambda: Image.open(TEST_FILE))
def test_image_new(self):
# Arrange
# Set limit to a low, easily testable value
Image.MAX_IMAGE_PIXELS = 10
self.assertEqual(Image.MAX_IMAGE_PIXELS, 10)
# Act / Assert
self.assert_warning(
Image.DecompressionBombWarning,
lambda: Image.new('L', (100, 100), 0))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()