[SCAN-3620] Load DependentLibraryInfo on init

datatheorem · Nov 16, 2022 · 78a2879 · 78a2879
1 parent c107c2a
commit 78a2879
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -9,9 +9,6 @@ ignore_missing_imports = True
 disallow_untyped_defs = True
 warn_unreachable = True
 error_summary = False
-exclude = (?x)(
-    ^scripts/.*
-  )
 
 [yapf]
 based_on_style = google

diff --git a/strongarm/macho/macho_binary.py b/strongarm/macho/macho_binary.py
@@ -66,23 +66,21 @@ class DependentLibraryInfo:
     https://opensource.apple.com/source/dyld/dyld-96.2/src/ImageLoaderMachO.cpp.auto.html
     """
 
-    def __init__(self, dylib_command: DylibCommandStruct) -> None:
+    def __init__(self, dylib_command: DylibCommandStruct, macho_binary: "MachoBinary") -> None:
         self.cmd = dylib_command
 
-        self.name = ""
-        self.checksum = self.cmd.dylib.timestamp
-        self.current_version = self.cmd.dylib.current_version  # maxVersion
-        self.compatibility_version = self.cmd.dylib.compatibility_version  # minVersion
-        self.required = self.cmd.cmd != MachoLoadCommands.LC_LOAD_WEAK_DYLIB
-        self.re_exported = self.cmd.cmd != MachoLoadCommands.LC_REEXPORT_DYLIB
-
-    def load_name(self, macho_binary: "MachoBinary") -> None:
         start_address = self.cmd.binary_offset + self.cmd.dylib.name.offset
         dylib_name = macho_binary.get_full_string_from_start_address(start_address, virtual=False)
         if not dylib_name:
-            raise ValueError("Could not read DylibCommandStruct.name")
+            logger.warning("Could not read DylibCommandStruct.name")
+            dylib_name = "<unknown dylib>"
 
         self.name = dylib_name
+        self.checksum = self.cmd.dylib.timestamp
+        self.current_version = self.cmd.dylib.current_version  # maxVersion
+        self.compatibility_version = self.cmd.dylib.compatibility_version  # minVersion
+        self.required = self.cmd.cmd != MachoLoadCommands.LC_LOAD_WEAK_DYLIB
+        self.re_exported = self.cmd.cmd != MachoLoadCommands.LC_REEXPORT_DYLIB
 
 
 class MachoSegment:
@@ -340,9 +338,8 @@ def _parse_load_commands(self, offset: StaticFilePointer, ncmds: int) -> None:
 
             elif load_command.cmd in [MachoLoadCommands.LC_LOAD_DYLIB, MachoLoadCommands.LC_LOAD_WEAK_DYLIB]:
                 dylib_load_command = self.read_struct(offset, DylibCommandStruct)
-                dependent_library_info = DependentLibraryInfo(dylib_load_command)
+                dependent_library_info = DependentLibraryInfo(dylib_load_command, macho_binary=self)
                 self.dependent_library_infos.append(dependent_library_info)
-                dependent_library_info.load_name(self)
 
             elif load_command.cmd == MachoLoadCommands.LC_CODE_SIGNATURE:
                 self._code_signature_cmd = self.read_struct(offset, MachoLinkeditDataCommandStruct)
@@ -368,7 +365,7 @@ def _parse_load_commands(self, offset: StaticFilePointer, ncmds: int) -> None:
             offset += load_command.cmdsize
 
     def read_struct(self, binary_offset: int, struct_type: Type[AIS], virtual: bool = False) -> AIS:
-        """Given an binary offset, return the structure it describes.
+        """Given a binary offset, return the structure it describes.
 
         Params:
             binary_offset: Address from where to read the bytes.