Skip to content

Fix reading global heap #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
davidhassell wants to merge 1 commit into from
Closed

Fix reading global heap #260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pyfive/misc_low_level.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,22 @@ def objects(self):
if self._objects is None:
self._objects = OrderedDict()
offset = 0
while offset < len(self.heap_data):
# Note: Need to add 16 to the offset to ensure at least 16
# bytes remain in the buffer to unpack a complete
# GLOBAL_HEAP_OBJECT header, preventing struct.error
# on trailing padding (< 16B). See
# https://github.com/NCAS-CMS/pyfive/issues/259
while offset + 16 <= len(self.heap_data):
info = _unpack_struct_from(GLOBAL_HEAP_OBJECT, self.heap_data, offset)
if info["object_index"] == 0:
break

offset += GLOBAL_HEAP_OBJECT_SIZE
fmt = "<" + str(info["object_size"]) + "s"
obj_data = struct.unpack_from(fmt, self.heap_data, offset)[0]
self._objects[info["object_index"]] = obj_data
offset += _padded_size(info["object_size"])

return self._objects


Expand Down
Loading