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

Prevent ImageMagick crash in identify when debugging MOBI6 files

Browse Source
This commit is contained in:
Kovid Goyal 2014-03-28 12:53:33 +05:30
parent 8d52fc6fd9
commit 157a2a3a69
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/ebooks/mobi/debug/mobi6.py
View File

@ -17,7 +17,7 @@ from calibre.ebooks.mobi.reader.index import (parse_index_record,
parse_tagx_section) parse_tagx_section)
from calibre.ebooks.mobi.utils import (decode_hex_number, decint, from calibre.ebooks.mobi.utils import (decode_hex_number, decint,
decode_tbs, read_font_record) decode_tbs, read_font_record)
from calibre.utils.magick.draw import identify_data from calibre.utils.imghdr import what
from calibre.ebooks.mobi.debug import format_bytes from calibre.ebooks.mobi.debug import format_bytes
from calibre.ebooks.mobi.debug.headers import TextRecord from calibre.ebooks.mobi.debug.headers import TextRecord
@ -763,7 +763,7 @@ class MOBIFile(object): # {{{
b'\xe9\x8e\r\n', b'RESC', b'BOUN', b'FDST', b'DATP', b'\xe9\x8e\r\n', b'RESC', b'BOUN', b'FDST', b'DATP',
b'AUDI', b'VIDE', b'FONT'}: b'AUDI', b'VIDE', b'FONT'}:
try: try:
width, height, fmt = identify_data(r.raw) fmt = what(None, r.raw)
except: except:
pass pass
if fmt is not None: if fmt is not None: