angr 9.2.131__py3-none-win_amd64.whl → 9.2.133__py3-none-win_amd64.whl

angr/analyses/cfg/cfg_fast.py

@@ -100,9 +100,9 @@ class FunctionReturn:
     """
 
     __slots__ = (
+        "call_site_addr",
         "callee_func_addr",
         "caller_func_addr",
-        "call_site_addr",
         "return_to",
     )
 
@@ -287,9 +287,9 @@ class FunctionEdge:
     """
 
     __slots__ = (
+        "ins_addr",
         "src_func_addr",
         "stmt_idx",
-        "ins_addr",
     )
 
     def apply(self, cfg):
@@ -302,11 +302,11 @@ class FunctionTransitionEdge(FunctionEdge):
     """
 
     __slots__ = (
-        "src_node",
         "dst_addr",
-        "to_outside",
         "dst_func_addr",
         "is_exception",
+        "src_node",
+        "to_outside",
     )
 
     def __init__(
@@ -353,7 +353,7 @@ class FunctionCallEdge(FunctionEdge):
     Describes a call edge in functions' transition graphs.
     """
 
-    __slots__ = ("src_node", "dst_addr", "ret_addr", "syscall")
+    __slots__ = ("dst_addr", "ret_addr", "src_node", "syscall")
 
     def __init__(self, src_node, dst_addr, ret_addr, src_func_addr, syscall=False, stmt_idx=None, ins_addr=None):
         self.src_node = src_node
@@ -380,7 +380,7 @@ class FunctionFakeRetEdge(FunctionEdge):
     Describes a FakeReturn (also called fall-through) edge in functions' transition graphs.
     """
 
-    __slots__ = ("src_node", "dst_addr", "confirmed")
+    __slots__ = ("confirmed", "dst_addr", "src_node")
 
     def __init__(self, src_node, dst_addr, src_func_addr, confirmed=None):
         self.src_node = src_node
@@ -402,7 +402,7 @@ class FunctionReturnEdge(FunctionEdge):
     Describes a return (from a function call or a syscall) edge in functions' transition graphs.
     """
 
-    __slots__ = ("ret_from_addr", "ret_to_addr", "dst_func_addr")
+    __slots__ = ("dst_func_addr", "ret_from_addr", "ret_to_addr")
 
     def __init__(self, ret_from_addr, ret_to_addr, dst_func_addr):
         self.ret_from_addr = ret_from_addr
@@ -437,19 +437,19 @@ class CFGJob:
     """
 
     __slots__ = (
+        "_func_edges",
         "addr",
         "func_addr",
+        "gp",
+        "job_type",
         "jumpkind",
-        "ret_target",
         "last_addr",
-        "src_node",
+        "ret_target",
+        "returning_source",
         "src_ins_addr",
+        "src_node",
         "src_stmt_idx",
-        "returning_source",
         "syscall",
-        "_func_edges",
-        "job_type",
-        "gp",
     )
 
     def __init__(
@@ -1812,7 +1812,8 @@ class CFGFast(ForwardAnalysis[CFGNode, CFGNode, CFGJob, int], CFGBase):  # pylin
                         elif (
                             not security_init_cookie_found
                             and is_function_security_init_cookie(func, self.project, security_cookie_addr)
-                            or not security_init_cookie_found
+                        ) or (
+                            not security_init_cookie_found
                             and is_function_security_init_cookie_win8(func, self.project, security_cookie_addr)
                         ):
                             security_init_cookie_found = True
@@ -3036,7 +3037,8 @@ class CFGFast(ForwardAnalysis[CFGNode, CFGNode, CFGJob, int], CFGBase):  # pylin
         self.kb.xrefs.add_xref(cr)
 
         if is_arm_arch(self.project.arch) and (
-            (irsb_addr & 1) == 1 and data_addr == (insn_addr & 0xFFFF_FFFF_FFFF_FFFE) + 4 or data_addr == insn_addr + 8
+            ((irsb_addr & 1) == 1 and data_addr == (insn_addr & 0xFFFF_FFFF_FFFF_FFFE) + 4)
+            or data_addr == insn_addr + 8
         ):
             return
         self.insn_addr_to_memory_data[insn_addr] = self.model.memory_data[data_addr]
@@ -3068,10 +3070,10 @@ class CFGFast(ForwardAnalysis[CFGNode, CFGNode, CFGJob, int], CFGBase):  # pylin
             irsb = self.project.factory.block(irsb.addr, size=irsb.size, opt_level=1, cross_insn_opt=False).vex
 
         # try to resolve the jump target
-        simsucc = self.project.factory.default_engine.process(self._initial_state, irsb, force_addr=addr)
+        simsucc = self.project.factory.default_engine.process(self._initial_state, block=irsb, force_addr=addr)
         if len(simsucc.successors) == 1:
             ip = simsucc.successors[0].ip
-            if isinstance(ip, claripy.ast.Base):
+            if isinstance(ip, claripy.ast.BV):
                 target_addr = ip.concrete_value
                 obj = self.project.loader.find_object_containing(target_addr, membership_check=False)
                 if (obj is not None and obj is not self.project.loader.main_object) or self.project.is_hooked(

angr/analyses/cfg/indirect_jump_resolvers/__init__.py

@@ -12,13 +12,13 @@ from .amd64_pe_iat import AMD64PeIatResolver
 
 
 __all__ = (
+    "AMD64ElfGotResolver",
+    "AMD64PeIatResolver",
+    "ArmElfFastResolver",
+    "ConstantResolver",
+    "JumpTableResolver",
     "MipsElfFastResolver",
     "MipsElfGotResolver",
     "X86ElfPicPltResolver",
-    "JumpTableResolver",
     "X86PeIatResolver",
-    "AMD64ElfGotResolver",
-    "ArmElfFastResolver",
-    "ConstantResolver",
-    "AMD64PeIatResolver",
 )

angr/analyses/cfg/indirect_jump_resolvers/amd64_elf_got.py

@@ -19,7 +19,7 @@ class AMD64ElfGotResolver(IndirectJumpResolver):
         super().__init__(project, timeless=True)
 
     def filter(self, cfg, addr, func_addr, block, jumpkind):
-        return jumpkind == "Ijk_Call" or jumpkind == "Ijk_Boring" and addr == func_addr
+        return jumpkind == "Ijk_Call" or (jumpkind == "Ijk_Boring" and addr == func_addr)
 
     def resolve(  # pylint:disable=unused-argument
         self, cfg, addr, func_addr, block, jumpkind, func_graph_complete: bool = True, **kwargs