🚑 Fix Structure builder type for new API

Fix #1

Author: ImNotAVirus

bnhelpers.py

@@ -3,14 +3,24 @@
 from .delphi_analyser import DelphiVMT
 from .constants import VMTFieldTypes
 
+## Backwards compatibility for API < 2500
+try:
+    StructureType = types.StructureBuilder
+except AttributeError:
+    StructureType = types.Structure
+
 
 class BNHelpers(object):
     @staticmethod
     def create_vmt_struct(bv: BinaryView, vmt: DelphiVMT) -> bool:
         if not vmt.is_valid:
             return False
 
-        vmt_struct = types.Structure()
+        ## Backwards compatibility for API < 2500
+        try:
+            vmt_struct = types.StructureBuilder.create()
+        except AttributeError:
+            vmt_struct = types.Structure()
 
         if not BNHelpers._add_vmt_fields(bv, vmt, vmt_struct):
             return False
@@ -31,7 +41,7 @@ def create_vmt_struct(bv: BinaryView, vmt: DelphiVMT) -> bool:
     # Protected methods
 
     @staticmethod
-    def _add_vmt_fields(bv: BinaryView, vmt: DelphiVMT, out_struct: types.Structure) -> bool:
+    def _add_vmt_fields(bv: BinaryView, vmt: DelphiVMT, out_struct: StructureType) -> bool:
         address_size = bv.address_size
         field_types = VMTFieldTypes(bv.arch)
         vmt_offsets = vmt.vmt_offsets
@@ -52,7 +62,7 @@ def _add_vmt_fields(bv: BinaryView, vmt: DelphiVMT, out_struct: types.Structure)
 
 
     @staticmethod
-    def _add_vmt_methods(bv: BinaryView, vmt: DelphiVMT, out_struct: types.Structure) -> bool:
+    def _add_vmt_methods(bv: BinaryView, vmt: DelphiVMT, out_struct: StructureType) -> bool:
         address_size = bv.address_size
 
         if not vmt.seek_to_vmt_offset(vmt.vmt_offsets.cVmtParent + address_size):
@@ -105,7 +115,7 @@ def _add_vmt_methods(bv: BinaryView, vmt: DelphiVMT, out_struct: types.Structure
     # Private methods
 
     @staticmethod
-    def __create_class_name_type(bv: BinaryView, vmt: DelphiVMT, out_struct: types.Structure) -> bool:
+    def __create_class_name_type(bv: BinaryView, vmt: DelphiVMT, out_struct: StructureType) -> bool:
         vmt_offsets = vmt.vmt_offsets
 
         if not vmt.seek_to_vmt_offset(vmt_offsets.cVmtClassName):
@@ -124,7 +134,12 @@ def __create_class_name_type(bv: BinaryView, vmt: DelphiVMT, out_struct: types.S
         if class_name_len is None:
             return False
 
-        class_name_struct = types.Structure()
+        ## Backwards compatibility for API < 2500
+        try:
+            class_name_struct = types.StructureBuilder.create()
+        except AttributeError:
+            class_name_struct = types.Structure()
+
         class_name_struct.append(Type.int(1, False), 'length')
         class_name_struct.append(Type.array(Type.char(), class_name_len), 'value')
         struct_type = Type.structure_type(class_name_struct)