Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.4.x] Fixed second security issue in image uploading. Disclosure and release forthcoming.

Browse Source 
Backport of b1d463468694f2e91fde67221b7996e9c52a9720 from master.
This commit is contained in:
Florian Apolloner 2012-07-30 21:58:55 +02:00
parent da33d67181
commit c14f325c4e
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
django/forms/fields.py
View File

@ -570,20 +570,10 @@ class ImageField(FileField):
file = StringIO(data['content']) file = StringIO(data['content'])
try: try:
# load() is the only method that can spot a truncated JPEG, # load() could spot a truncated JPEG, but it loads the entire
# but it cannot be called sanely after verify() # image in memory, which is a DoS vector. See #3848 and #18520.
trial_image = Image.open(file) # verify() must be called immediately after the constructor.
trial_image.load() Image.open(file).verify()
# Since we're about to use the file again we have to reset the
# file object if possible.
if hasattr(file, 'reset'):
file.reset()
# verify() is the only method that can spot a corrupt PNG,
# but it must be called immediately after the constructor
trial_image = Image.open(file)
trial_image.verify()
except ImportError: except ImportError:
# Under PyPy, it is possible to import PIL. However, the underlying # Under PyPy, it is possible to import PIL. However, the underlying
# _imaging C module isn't available, so an ImportError will be # _imaging C module isn't available, so an ImportError will be