Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not allow ImageMagick to process images of any type other than GIF/JPEG/PNG/WEBP/JPEG2000

Browse Source
This commit is contained in:
Kovid Goyal 2016-05-04 10:27:44 +05:30
parent 01460a4304
commit 816063041c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/utils/magick/__init__.py
View File

@ -8,6 +8,7 @@ __docformat__ = 'restructuredtext en'
import os import os
from calibre.constants import plugins, filesystem_encoding from calibre.constants import plugins, filesystem_encoding
from calibre.utils.imghdr import what
_magick, _merr = plugins['magick'] _magick, _merr = plugins['magick']
@ -132,21 +133,18 @@ class Image(_magick.Image): # {{{
if not data: if not data:
raise ValueError('Cannot open image from empty data string') raise ValueError('Cannot open image from empty data string')
data = bytes(data) data = bytes(data)
fmt = what(None, data)
if fmt not in {'gif', 'png', 'jpeg', 'jpeg2000', 'webp'}:
raise ValueError('Unsupported image format: %s' % fmt)
return _magick.Image.load(self, data) return _magick.Image.load(self, data)
def open(self, path_or_file): def open(self, path_or_file):
if not hasattr(path_or_file, 'read') and \
path_or_file.lower().endswith('.wmf'):
# Special handling for WMF files as ImageMagick seems
# to hang while reading them from a blob on linux
if isinstance(path_or_file, unicode):
path_or_file = path_or_file.encode(filesystem_encoding)
return _magick.Image.read(self, path_or_file)
data = path_or_file data = path_or_file
if hasattr(data, 'read'): if hasattr(data, 'read'):
data = data.read() data = data.read()
else: else:
data = open(data, 'rb').read() with lopen(data, 'rb') as f:
data = f.read()
if not data: if not data:
raise ValueError('%r is an empty file'%path_or_file) raise ValueError('%r is an empty file'%path_or_file)
self.load(data) self.load(data)