[Lifter] Complex Type Lifting (#445)

* Create draft PR for #444 * Switch Error fix and already lifted --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Spartak Ehrlich <[email protected]> Co-authored-by: Niklas Bergmann <[email protected]>
fkie-cad · Nov 22, 2024 · 54a3ed8 · 54a3ed8
1 parent 43f49d1
commit 54a3ed8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/decompiler/frontend/binaryninja/handlers/globals.py b/decompiler/frontend/binaryninja/handlers/globals.py
@@ -158,6 +158,10 @@ def lift_global_variable(
         if not self._view:
             self._view = view
 
+        # BNinja error cases: nullptr/small numbers (0, -12...)
+        if not addr_in_section(view, variable.address):
+            return Constant(variable.address, vartype=Integer(view.address_size * BYTE_SIZE, False))
+
         # If addr was already lifted: Return lifted GlobalVariable with updated SSA
         variable_identifier = (variable.address, self._lifter.lift(variable.type))
         if variable_identifier in self._lifted_globals.keys():
@@ -167,10 +171,6 @@ def lift_global_variable(
                 else self._lifted_globals[variable_identifier]
             )
 
-        # BNinja error cases: nullptr/small numbers (0, -12...)
-        if not addr_in_section(view, variable.address):
-            return Constant(variable.address, vartype=Integer(view.address_size * BYTE_SIZE, False))
-
         # Check if there is a cycle between GlobalVariables initial_value
         if callers and variable.address in callers:
             return (