innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #29705 -- Fixed ImageField RuntimeError crash for WebP files.

This commit is contained in:
winkidney 2018-08-22 19:34:51 +08:00 committed by Tim Graham
parent 586a9dc429
commit c69d40f943
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/files/images.py
View File

@ -69,6 +69,10 @@ def get_image_dimensions(file_or_path, close=False):
# less bytes than expected. Skip and feed more data to the # less bytes than expected. Skip and feed more data to the
# parser (ticket #24544). # parser (ticket #24544).
pass pass
except RuntimeError:
# e.g. "RuntimeError: could not create decoder object" for
# WebP files. A different chunk_size may work.
pass
if p.image: if p.image:
return p.image.size return p.image.size
chunk_size *= 2 chunk_size *= 2

BIN
tests/files/test.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

6
tests/files/tests.py
View File

@ -343,6 +343,12 @@ class GetImageDimensionsTests(unittest.TestCase):
size = images.get_image_dimensions(fh) size = images.get_image_dimensions(fh)
self.assertEqual(size, (None, None)) self.assertEqual(size, (None, None))
def test_webp(self):
img_path = os.path.join(os.path.dirname(__file__), 'test.webp')
with open(img_path, 'rb') as fh:
size = images.get_image_dimensions(fh)
self.assertEqual(size, (540, 405))
class FileMoveSafeTests(unittest.TestCase): class FileMoveSafeTests(unittest.TestCase):
def test_file_move_overwrite(self): def test_file_move_overwrite(self):