feat: support structs with pointers to not-yet-inflated structs

Author: MrIndeciso

libdestruct/common/type_inflater.py

@@ -49,6 +49,9 @@ def inflate_field(self: TypeInflater, own: type, field: StructField, address: in
             if not field.backing_type:
                 field.backing_type = own
             elif issubclass(field.backing_type, struct) and not issubclass(field.backing_type, struct_impl):
+                if not hasattr(field.backing_type, "_type_impl"):
+                    self._inflate_struct_type(field.backing_type)
+
                 field.backing_type = field.backing_type._type_impl
 
         return field.inflate(self.memory, address)
@@ -63,20 +66,10 @@ def inflate_struct(self: TypeInflater, reference_type: type, address: int | tupl
         Returns:
             The inflated struct.
         """
-        if hasattr(reference_type, "_type_impl"):
-            type_impl = reference_type._type_impl
-            instance = type_impl(self.memory, address)
-        else:
-            type_impl = type(reference_type.__name__, (struct_impl,), {"_members": {}})
-
-            type_impl._reference_struct = None
+        self._inflate_struct_type(reference_type)
 
-            instance = type_impl(self.memory, address)
-
-            type_impl._reference_struct = reference_type
-            type_impl._inflater = self
-
-            reference_type._type_impl = type_impl
+        type_impl = reference_type._type_impl
+        instance = type_impl(self.memory, address)
 
         self._inflate_struct_instance(instance, reference_type)
 
@@ -100,3 +93,16 @@ def _inflate_struct_instance(self: TypeInflater, instance: struct_impl, referenc
             current_offset += annotation.size
 
         instance.size = current_offset
+
+    def _inflate_struct_type(self: TypeInflater, reference_type: type) -> None:
+        if hasattr(reference_type, "_type_impl"):
+            return
+
+        type_impl = type(reference_type.__name__, (struct_impl,), {"_members": {}})
+
+        type_impl._reference_struct = None
+
+        reference_type._type_impl = type_impl
+
+        type_impl._reference_struct = reference_type
+        type_impl._inflater = self

test/scripts/basic_struct_test.py

@@ -230,9 +230,6 @@ class test8(struct):
 
         struct_ptr = d.regs.rdi
 
-        # TODO: this is a hack, fix
-        _ = libdestruct.inflate(test5, 0x0)
-
         test = libdestruct.inflate(test8, struct_ptr)
 
         self.assertEqual(test.a.unwrap().a.value, 0x5eadbeef)