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

Fix #1441 (This book cause calibre to hang)

Browse Source
This commit is contained in:
Kovid Goyal 2008-12-23 13:14:12 -08:00
parent af1319138a
commit 252dd342e0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/rtf2xml/ParseRtf.py
View File

@ -233,7 +233,7 @@ class ParseRtf:
bug_handler = RtfInvalidCodeException, bug_handler = RtfInvalidCodeException,
) )
check_encoding_obj.check_encoding(self.__file) check_encoding_obj.check_encoding(self.__file)
sys.stderr.write('File "%s" does not appear to be RTF.\n' % self.__file) sys.stderr.write('File "%s" does not appear to be RTF.\n' % self.__file if isinstance(self.__file, str) else self.__file.encode('utf-8'))
raise InvalidRtfException, msg raise InvalidRtfException, msg
delete_info_obj = delete_info.DeleteInfo( delete_info_obj = delete_info.DeleteInfo(
in_file = self.__temp_file, in_file = self.__temp_file,

5
src/calibre/ebooks/rtf2xml/check_encoding.py
View File

@ -23,7 +23,10 @@ class CheckEncoding:
try: try:
line.decode(encoding) line.decode(encoding)
except UnicodeError: except UnicodeError:
self.__get_position_error(line, encoding, line_num) if len(line) < 1000:
self.__get_position_error(line, encoding, line_num)
else:
sys.stderr.write('line: %d has bad encoding\n'%line_num)
if __name__ == '__main__': if __name__ == '__main__':
check_encoding_obj = CheckEncoding() check_encoding_obj = CheckEncoding()
check_encoding_obj.check_encoding(sys.argv[1]) check_encoding_obj.check_encoding(sys.argv[1])