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

py3: Couple of fixes for individual byte access in the xz module

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-31 19:42:10 +05:30
parent 65146815d7
commit f809313dc5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
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/lzma/xz.py
View File

@ -51,7 +51,7 @@ def decode_var_int(f):
def decode_var_int2(raw, pos): def decode_var_int2(raw, pos):
ans, ch, opos = 0, 0x80, pos ans, ch, opos = 0, 0x80, pos
while ch >= 0x80: while ch >= 0x80:
ch = ord(raw[pos]) ch = ord(raw[pos:pos+1])
if ch == 0: if ch == 0:
return 0, pos return 0, pos
ans |= (ch & 0x7f) << ((pos - opos) * 7) ans |= (ch & 0x7f) << ((pos - opos) * 7)
@ -235,7 +235,7 @@ def read_block_header(f, block_header_size_, check_type):
) )
if crc != crc32(block_header_size_ + header): if crc != crc32(block_header_size_ + header):
raise InvalidXZ('Block header CRC mismatch') raise InvalidXZ('Block header CRC mismatch')
block_flags = ord(header[0]) block_flags = ord(header[0:1])
number_of_filters = (0x03 & block_flags) + 1 number_of_filters = (0x03 & block_flags) + 1
if not (0 < number_of_filters <= 4): if not (0 < number_of_filters <= 4):
raise InvalidXZ('Invalid number of filters: %d' % number_of_filters) raise InvalidXZ('Invalid number of filters: %d' % number_of_filters)