Ticket #18520: patch.diff

django/forms/fields.py

@@ -559 +559 @@
             # load() is the only method that can spot a truncated JPEG,
             #  but it cannot be called sanely after verify()
             trial_image = Image.open(file)
+            
+            MAX_DIMENSIONS = (5000, 5000)
+            dimensions = trial_image.size
+            if dimensions[0] > MAX_DIMENSIONS[0] or dimensions[1] > MAX_DIMENSIONS[1]:
+                raise ValidationError('Maximum image dimensions are %sx%s px. This file is %sx%s px' % (MAX_DIMENSIONS + dimensions))
+            
             trial_image.load()
 
             # Since we're about to use the file again we have to reset the
@@ -575 +581 @@
             # _imaging C module isn't available, so an ImportError will be
             # raised. Catch and re-raise.
             raise
+        except ValidationError:
+            # any validation errors are re-raised as is
+            raise
         except Exception: # Python Imaging Library doesn't recognize it as an image
             raise ValidationError(self.error_messages['invalid_image'])
         if hasattr(f, 'seek') and callable(f.seek):