Skip to content

Add Structure method to determine field size #274

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

Open
shizmob wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add Structure method to determine field size #274

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb1ce37
Add Structure method to determine field size
shizmob Nov 8, 2019
f1b4b9e
Merge branch 'master' into shizmob-master
nightlark Mar 28, 2026
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
18 changes: 15 additions & 3 deletions pefile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@ def set_format(format):
__format_str__ = "<"
__unpacked_data_elms__ = []
__field_offsets__ = {}
__field_sizes__ = {}
__keys__ = []
__format_length__ = 0

Expand All @@ -908,6 +909,7 @@ def set_format(format):
__unpacked_data_elms__.append(None)

elm_names = elm_name.split(",")
elm_size = sizeof_type(elm_type)
names = []
for elm_name in elm_names:
if elm_name in __keys__:
Expand All @@ -916,8 +918,9 @@ def set_format(format):
elm_name = "{0}_{1:d}".format(elm_name, occ_count)
names.append(elm_name)
__field_offsets__[elm_name] = offset
__field_sizes__[elm_name] = elm_size

offset += sizeof_type(elm_type)
offset += elm_size

# Some PE header structures have unions on them, so a certain
# value might have different names, so each key has a list of
Expand All @@ -930,6 +933,7 @@ def set_format(format):
__format_str__,
__unpacked_data_elms__,
__field_offsets__,
__field_sizes__,
__keys__,
__format_length__,
)
Expand All @@ -948,6 +952,7 @@ def __init__(self, format, name=None, file_offset=None):
self.__keys__ = []
self.__format_length__ = 0
self.__field_offsets__ = {}
self.__field_sizes__ = {}
self.__unpacked_data_elms__ = []

d = format[1]
Expand All @@ -959,6 +964,7 @@ def __init__(self, format, name=None, file_offset=None):
self.__format_str__,
self.__unpacked_data_elms__,
self.__field_offsets__,
self.__field_sizes__,
self.__keys__,
self.__format_length__,
) = set_format(d)
Expand Down Expand Up @@ -997,6 +1003,11 @@ def sizeof(self):

return self.__format_length__

def sizeof_field(self, field):
"""Return size of the requested field."""

return self.__field_sizes__[field]

def __unpack__(self, data):
if len(data) > self.__format_length__:
data = data[: self.__format_length__]
Expand Down Expand Up @@ -1398,7 +1409,7 @@ def get_bits_left(self):
ac.add_subfield(elm_name, elm_bits)
ac.wrap_up()

format_str, _, field_offsets, keys, format_length = set_format(tuple(old_fmt))
format_str, _, field_offsets, field_sizes, keys, format_length = set_format(tuple(old_fmt))

extended_keys = []
for idx, val in enumerate(keys):
Expand All @@ -1411,7 +1422,7 @@ def get_bits_left(self):
for n in bf_names:
field_offsets[n[0]] = field_offsets[val[0]]

return (format_str, format_length, field_offsets, keys, extended_keys, comp_fields)
return (format_str, format_length, field_offsets, field_sizes, keys, extended_keys, comp_fields)


class StructureWithBitfields(Structure):
Expand Down Expand Up @@ -1445,6 +1456,7 @@ def __init__(self, format, name=None, file_offset=None):
self.__format_str__,
self.__format_length__,
self.__field_offsets__,
self.__field_sizes__,
self.__keys__,
self.__keys_ext__,
self.__compound_fields__,
Expand Down
Loading