Skip to content

Commit

Permalink
[1.3.x] Fixed a security issue in image uploading. Disclosure and rel…
Browse files Browse the repository at this point in the history
…ease forthcoming.

Backport of dd16b17 from master.
  • Loading branch information
apollo13 committed Jul 30, 2012
1 parent 7ca10b1 commit 9ca0ff6
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion django/core/files/images.py
Expand Up @@ -47,13 +47,18 @@ def get_image_dimensions(file_or_path, close=False):
file = open(file_or_path, 'rb')
close = True
try:
# Most of the time PIL only needs a small chunk to parse the image and
# get the dimensions, but with some TIFF files PIL needs to parse the
# whole file.
chunk_size = 1024
while 1:
data = file.read(1024)
data = file.read(chunk_size)
if not data:
break
p.feed(data)
if p.image:
return p.image.size
chunk_size = chunk_size*2
return None
finally:
if close:
Expand Down

0 comments on commit 9ca0ff6

Please sign in to comment.