mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #21538: The plistlib module now supports loading of binary plist files

Browse source 
when reference or offset size is not a power of two.
This commit is contained in:
Serhiy Storchaka 2014-05-23 16:13:33 +03:00
parent f01fffedd1
commit 065266450e
3 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/plistlib.py
View file

@ -619,10 +619,7 @@ class _BinaryPlistParser:
offset_table_offset
) = struct.unpack('>6xBBQQQ', trailer)
self._fp.seek(offset_table_offset)
offset_format = '>' + _BINARY_FORMAT[offset_size] * num_objects
self._ref_format = _BINARY_FORMAT[self._ref_size]
self._object_offsets = struct.unpack(
offset_format, self._fp.read(offset_size * num_objects))
self._object_offsets = self._read_ints(num_objects, offset_size)
return self._read_object(self._object_offsets[top_object])
except (OSError, IndexError, struct.error):
@ -638,9 +635,16 @@ class _BinaryPlistParser:
return tokenL
def _read_ints(self, n, size):
data = self._fp.read(size * n)
if size in _BINARY_FORMAT:
return struct.unpack('>' + _BINARY_FORMAT[size] * n, data)
else:
return tuple(int.from_bytes(data[i: i + size], 'big')
for i in range(0, size * n, size))
def _read_refs(self, n):
return struct.unpack(
'>' + self._ref_format * n, self._fp.read(n * self._ref_size))
return self._read_ints(n, self._ref_size)
def _read_object(self, offset):
"""