Skip to content

Commit

Permalink
Pass context when reading a compiled Structure or Array
Browse files Browse the repository at this point in the history
After allowing nested arrays in previous commits, only the parent
type would have access to the context while resolving expressions.

This changeset updates the compiled so that other fields' values
are passed as context so that sublevel arrays can also resolve
their size from an expression correct. A test has been written
to verify this change.
  • Loading branch information
MrYoranimo committed Feb 25, 2023
1 parent f57fe5c commit ef710a2
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 3 deletions.
6 changes: 3 additions & 3 deletions dissect/cstruct/compiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,22 +135,22 @@ def gen_struct_class(self, name: str, structure: Structure) -> str:
f"""
r['{field.name}'] = []
for _ in range({num}):
r['{field.name}'].append(self.lookup['{field.name}'].type.type._read(stream))
r['{field.name}'].append(self.lookup['{field.name}'].type.type._read(stream, context=r))
sizes['{field.name}'] = stream.tell() - s
"""
)
elif isinstance(field_type, Structure) and field_type.anonymous:
struct_read += dedent(
f"""
v = self.lookup["{field.name}"].type._read(stream)
v = self.lookup["{field.name}"].type._read(stream, context=r)
r.update(v._values)
sizes.update(v._sizes)
"""
)
else:
struct_read += dedent(
f"""
r['{field.name}'] = self.lookup['{field.name}'].type._read(stream)
r['{field.name}'] = self.lookup['{field.name}'].type._read(stream, context=r)
sizes['{field.name}'] = stream.tell() - s
"""
)
Expand Down
31 changes: 31 additions & 0 deletions tests/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,37 @@ def test_array_three_dimensional(compiled):
assert obj.dumps() == buf


@pytest.mark.parametrize("compiled", [True, False])
def test_nested_array_of_variable_size(compiled: bool):
cdef = """
struct test {
uint8 outer;
uint8 medior;
uint8 inner;
uint8 a[outer][medior][inner];
}
"""
cs = cstruct.cstruct(endian="<")
cs.load(cdef, compiled=compiled)

assert verify_compiled(cs.test, compiled)

buf = b"\x02\x01\x03\x01\x02\x03\x04\x05\x06"
obj = cs.test(buf)

assert obj.outer == 2
assert obj.medior == 1
assert obj.inner == 3
assert obj.a[0][0][0] == 1
assert obj.a[0][0][1] == 2
assert obj.a[0][0][2] == 3
assert obj.a[1][0][0] == 4
assert obj.a[1][0][1] == 5
assert obj.a[1][0][2] == 6

assert obj.dumps() == buf


def test_report_array_size_mismatch():
cdef = """
struct test {
Expand Down

0 comments on commit ef710a2

Please sign in to comment.