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

Also prevent ImageMagick identify routine from touching images other than the core types

Browse Source
This commit is contained in:
Kovid Goyal 2016-05-04 10:32:16 +05:30
parent 816063041c
commit 4adb20ebb4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,6 +235,12 @@ class Image(_magick.Image): # {{{
_magick.Image.quantize(self, number_colors, colorspace, treedepth, dither, _magick.Image.quantize(self, number_colors, colorspace, treedepth, dither,
measure_error) measure_error)
def identify(self, data):
fmt = what(None, data)
if fmt not in {'gif', 'png', 'jpeg', 'jpeg2000', 'webp'}:
raise ValueError('Unsupported image format: %s' % fmt)
return _magick.Image.identify(self, data)
def trim(self, fuzz): def trim(self, fuzz):
try: try:
_magick.Image.remove_border(self, fuzz) _magick.Image.remove_border(self, fuzz)

6
src/calibre/utils/magick/draw.py
View File

@ -141,9 +141,6 @@ def identify_data(data):
(width, height, format) (width, height, format)
or raises an Exception if data is not an image. or raises an Exception if data is not an image.
''' '''
if data.startswith(b'<?xml'):
# ImageMagick segfaults when trying to identify SVG images
raise ValueError('Identifying svg images is not supported')
img = Image() img = Image()
img.identify(data) img.identify(data)
width, height = img.size width, height = img.size
@ -156,7 +153,8 @@ def identify(path):
(width, height, format) (width, height, format)
or raises an Exception. or raises an Exception.
''' '''
data = open(path, 'rb').read() with lopen(path, 'rb') as f:
data = f.read()
return identify_data(data) return identify_data(data)
def add_borders_to_image(img_data, left=0, top=0, right=0, bottom=0, def add_borders_to_image(img_data, left=0, top=0, right=0, bottom=0,