angr 9.2.86__py3-none-win_amd64.whl → 9.2.87__py3-none-win_amd64.whl

angr/__init__.py

@@ -1,7 +1,7 @@
 # pylint: disable=wildcard-import
 # pylint: disable=wrong-import-position
 
-__version__ = "9.2.86"
+__version__ = "9.2.87"
 
 if bytes is str:
     raise Exception(

angr/analyses/calling_convention.py

@@ -166,9 +166,11 @@ class CallingConventionAnalysis(Analysis):
                     )
                     cc_cls = default_cc(
                         self.project.arch.name,
-                        platform=self.project.simos.name
-                        if self.project is not None and self.project.simos is not None
-                        else None,
+                        platform=(
+                            self.project.simos.name
+                            if self.project is not None and self.project.simos is not None
+                            else None
+                        ),
                     )
                     if cc_cls is not None:
                         cc = cc_cls(self.project.arch)
@@ -224,9 +226,9 @@ class CallingConventionAnalysis(Analysis):
             ]
             cc_cls = default_cc(
                 self.project.arch.name,
-                platform=self.project.simos.name
-                if self.project is not None and self.project.simos is not None
-                else None,
+                platform=(
+                    self.project.simos.name if self.project is not None and self.project.simos is not None else None
+                ),
             )
             if cc_cls is not None:
                 cc = cc_cls(self.project.arch)

angr/analyses/data_dep/data_dependency_analysis.py

@@ -1,4 +1,5 @@
 """Defines analysis that will generate a dynamic data-dependency graph"""
+
 import logging
 import math
 from typing import Optional, List, Union, Dict, Set, Tuple, TYPE_CHECKING

angr/analyses/decompiler/condition_processor.py

@@ -309,9 +309,11 @@ class ConditionProcessor:
         elif isinstance(node, CodeNode):
             node = CodeNode(
                 self.remove_claripy_bool_asts(node.node, memo=memo),
-                None
-                if node.reaching_condition is None
-                else self.convert_claripy_bool_ast(node.reaching_condition, memo=memo),
+                (
+                    None
+                    if node.reaching_condition is None
+                    else self.convert_claripy_bool_ast(node.reaching_condition, memo=memo)
+                ),
             )
             return node
 
@@ -325,9 +327,11 @@ class ConditionProcessor:
         elif isinstance(node, ConditionNode):
             return ConditionNode(
                 node.addr,
-                None
-                if node.reaching_condition is None
-                else self.convert_claripy_bool_ast(node.reaching_condition, memo=memo),
+                (
+                    None
+                    if node.reaching_condition is None
+                    else self.convert_claripy_bool_ast(node.reaching_condition, memo=memo)
+                ),
                 self.convert_claripy_bool_ast(node.condition, memo=memo),
                 self.remove_claripy_bool_asts(node.true_node, memo=memo),
                 self.remove_claripy_bool_asts(node.false_node, memo=memo),
@@ -689,9 +693,11 @@ class ConditionProcessor:
             "__mod__": lambda cond_, tags: _binary_op_reduce("Mod", cond_.args, tags),
             "LShR": lambda cond_, tags: _binary_op_reduce("Shr", cond_.args, tags),
             "BVV": lambda cond_, tags: ailment.Expr.Const(None, None, cond_.args[0], cond_.size(), **tags),
-            "BoolV": lambda cond_, tags: ailment.Expr.Const(None, None, True, 1, **tags)
-            if cond_.args[0] is True
-            else ailment.Expr.Const(None, None, False, 1, **tags),
+            "BoolV": lambda cond_, tags: (
+                ailment.Expr.Const(None, None, True, 1, **tags)
+                if cond_.args[0] is True
+                else ailment.Expr.Const(None, None, False, 1, **tags)
+            ),
             "Extract": lambda cond_, tags: self._convert_extract(*cond_.args, tags, memo=memo),
             "ZeroExt": lambda cond_, tags: _binary_op_reduce(
                 "Concat", [claripy.BVV(0, cond_.args[0]), cond_.args[1]], tags

angr/analyses/decompiler/empty_node_remover.py

@@ -133,9 +133,11 @@ class EmptyNodeRemover:
             return ConditionNode(
                 node.addr,
                 node.reaching_condition,
-                ConditionProcessor.simplify_condition(claripy.Not(node.condition))
-                if self._claripy_ast_conditions
-                else negate(node.condition),
+                (
+                    ConditionProcessor.simplify_condition(claripy.Not(node.condition))
+                    if self._claripy_ast_conditions
+                    else negate(node.condition)
+                ),
                 false_node,
                 false_node=None,
             )

angr/analyses/decompiler/optimization_passes/optimization_pass.py

@@ -52,9 +52,9 @@ class BaseOptimizationPass:
     ARCHES = []  # strings of supported architectures
     PLATFORMS = []  # strings of supported platforms. Can be one of the following: "win32", "linux"
     STAGE: int = None  # Specifies when this optimization pass should be executed
-    STRUCTURING: Optional[
-        str
-    ] = None  # specifies if this optimization pass is specific to a certain structuring algorithm
+    STRUCTURING: Optional[str] = (
+        None  # specifies if this optimization pass is specific to a certain structuring algorithm
+    )
     NAME = "N/A"
     DESCRIPTION = "N/A"
 

angr/analyses/decompiler/structured_codegen/c.py

@@ -2801,18 +2801,24 @@ class CStructuredCodeGenerator(BaseStructuredCodeGenerator, Analysis):
             result = reduce(
                 lambda a1, a2: CBinaryOp("Add", a1, a2, codegen=self),
                 (
-                    CBinaryOp(
-                        "Mul",
-                        CConstant(c, t.type, codegen=self),
-                        t
-                        if not isinstance(t.type, SimTypePointer)
-                        else CTypeCast(t.type, SimTypePointer(SimTypeChar()), t, codegen=self),
-                        codegen=self,
+                    (
+                        CBinaryOp(
+                            "Mul",
+                            CConstant(c, t.type, codegen=self),
+                            (
+                                t
+                                if not isinstance(t.type, SimTypePointer)
+                                else CTypeCast(t.type, SimTypePointer(SimTypeChar()), t, codegen=self)
+                            ),
+                            codegen=self,
+                        )
+                        if c != 1
+                        else (
+                            t
+                            if not isinstance(t.type, SimTypePointer)
+                            else CTypeCast(t.type, SimTypePointer(SimTypeChar()), t, codegen=self)
+                        )
                     )
-                    if c != 1
-                    else t
-                    if not isinstance(t.type, SimTypePointer)
-                    else CTypeCast(t.type, SimTypePointer(SimTypeChar()), t, codegen=self)
                     for c, t in o_terms
                 ),
             )

angr/analyses/decompiler/structuring/phoenix.py

@@ -179,9 +179,11 @@ class PhoenixStructurer(StructurerBase):
                 removed_edge = self._last_resort_refinement(
                     self._region.head,
                     self._region.graph,
-                    self._region.graph_with_successors
-                    if self._region.graph_with_successors is not None
-                    else networkx.DiGraph(self._region.graph),
+                    (
+                        self._region.graph_with_successors
+                        if self._region.graph_with_successors is not None
+                        else networkx.DiGraph(self._region.graph)
+                    ),
                 )
                 self._assert_graph_ok(self._region.graph, "Last resort refinement went wrong")
                 if not removed_edge:
@@ -204,9 +206,11 @@ class PhoenixStructurer(StructurerBase):
                 node,
                 self._region.head,
                 self._region.graph,
-                self._region.graph_with_successors
-                if self._region.graph_with_successors is not None
-                else networkx.DiGraph(self._region.graph),
+                (
+                    self._region.graph_with_successors
+                    if self._region.graph_with_successors is not None
+                    else networkx.DiGraph(self._region.graph)
+                ),
             )
             l.debug("... matching cyclic schemas: %s at %r", matched, node)
             any_matches |= matched
@@ -911,9 +915,11 @@ class PhoenixStructurer(StructurerBase):
             try:
                 any_matches_this_iteration = self._match_acyclic_schemas(
                     self._region.graph,
-                    self._region.graph_with_successors
-                    if self._region.graph_with_successors is not None
-                    else networkx.DiGraph(self._region.graph),
+                    (
+                        self._region.graph_with_successors
+                        if self._region.graph_with_successors is not None
+                        else networkx.DiGraph(self._region.graph)
+                    ),
                     self._region.head,
                 )
             except GraphChangedNotification:

angr/analyses/disassembly.py

@@ -1168,18 +1168,20 @@ class Disassembly(Analysis):
 
         if formatting is None:
             formatting = {
-                "colors": {
-                    "address": "gray",
-                    "bytes": "cyan",
-                    "edge": "yellow",
-                    Label: "bright_yellow",
-                    ConstantOperand: "cyan",
-                    MemoryOperand: "yellow",
-                    Comment: "gray",
-                    Hook: "green",
-                }
-                if ansi_color_enabled and color
-                else {},
+                "colors": (
+                    {
+                        "address": "gray",
+                        "bytes": "cyan",
+                        "edge": "yellow",
+                        Label: "bright_yellow",
+                        ConstantOperand: "cyan",
+                        MemoryOperand: "yellow",
+                        Comment: "gray",
+                        Hook: "green",
+                    }
+                    if ansi_color_enabled and color
+                    else {}
+                ),
                 "format_callback": lambda item, s: ansi_color(s, formatting["colors"].get(type(item), None)),
             }
 

angr/analyses/reaching_definitions/dep_graph.py

@@ -240,8 +240,7 @@ class DepGraph:
         *,
         kind: Type[A],
         **kwargs: Any,
-    ) -> List[Definition[A]]:
-        ...
+    ) -> List[Definition[A]]: ...
 
     @overload
     def find_all_predecessors(
@@ -250,8 +249,7 @@ class DepGraph:
         *,
         kind: Literal[AtomKind.REGISTER] = AtomKind.REGISTER,
         **kwargs: Any,
-    ) -> List[Definition[Register]]:
-        ...
+    ) -> List[Definition[Register]]: ...
 
     @overload
     def find_all_predecessors(
@@ -260,8 +258,7 @@ class DepGraph:
         *,
         kind: Literal[AtomKind.MEMORY] = AtomKind.MEMORY,
         **kwargs: Any,
-    ) -> List[Definition[MemoryLocation]]:
-        ...
+    ) -> List[Definition[MemoryLocation]]: ...
 
     @overload
     def find_all_predecessors(
@@ -270,8 +267,7 @@ class DepGraph:
         *,
         kind: Literal[AtomKind.TMP] = AtomKind.TMP,
         **kwargs: Any,
-    ) -> List[Definition[Tmp]]:
-        ...
+    ) -> List[Definition[Tmp]]: ...
 
     @overload
     def find_all_predecessors(
@@ -280,8 +276,7 @@ class DepGraph:
         *,
         kind: Literal[AtomKind.CONSTANT] = AtomKind.CONSTANT,
         **kwargs: Any,
-    ) -> List[Definition[ConstantSrc]]:
-        ...
+    ) -> List[Definition[ConstantSrc]]: ...
 
     @overload
     def find_all_predecessors(
@@ -290,8 +285,7 @@ class DepGraph:
         *,
         kind: Literal[AtomKind.GUARD] = AtomKind.GUARD,
         **kwargs: Any,
-    ) -> List[Definition[GuardUse]]:
-        ...
+    ) -> List[Definition[GuardUse]]: ...
 
     @overload
     def find_all_predecessors(
@@ -300,26 +294,22 @@ class DepGraph:
         *,
         reg_name: Union[int, str] = ...,
         **kwargs: Any,
-    ) -> List[Definition[Register]]:
-        ...
+    ) -> List[Definition[Register]]: ...
 
     @overload
     def find_all_predecessors(
         self, starts: Union[Definition[Atom], Iterable[Definition[Atom]]], *, stack_offset: int = ..., **kwargs: Any
-    ) -> List[Definition[MemoryLocation]]:
-        ...
+    ) -> List[Definition[MemoryLocation]]: ...
 
     @overload
     def find_all_predecessors(
         self, starts: Union[Definition[Atom], Iterable[Definition[Atom]]], *, const_val: int = ..., **kwargs: Any
-    ) -> List[Definition[ConstantSrc]]:
-        ...
+    ) -> List[Definition[ConstantSrc]]: ...
 
     @overload
     def find_all_predecessors(
         self, starts: Union[Definition[Atom], Iterable[Definition[Atom]]], **kwargs: Any
-    ) -> List[Definition[Atom]]:
-        ...
+    ) -> List[Definition[Atom]]: ...
 
     def find_all_predecessors(self, starts, **kwargs):
         """

angr/analyses/reaching_definitions/rd_state.py

@@ -496,14 +496,12 @@ class ReachingDefinitionsState:
     @overload
     def get_concrete_value(
         self, spec: Union[Atom, Definition[Atom], Iterable[Atom]], cast_to: Type[int] = ...
-    ) -> Optional[int]:
-        ...
+    ) -> Optional[int]: ...
 
     @overload
     def get_concrete_value(
         self, spec: Union[Atom, Definition[Atom], Iterable[Atom]], cast_to: Type[bytes] = ...
-    ) -> Optional[bytes]:
-        ...
+    ) -> Optional[bytes]: ...
 
     def get_concrete_value(
         self, spec: Union[Atom, Definition[Atom], Iterable[Atom]], cast_to: Union[Type[int], Type[bytes]] = int
@@ -574,8 +572,7 @@ class ReachingDefinitionsState:
         pointer: Union[int, claripy.ast.bv.BV, HeapAddress, SpOffset],
         size: Union[int, DerefSize],
         endness: str = ...,
-    ) -> Optional[MemoryLocation]:
-        ...
+    ) -> Optional[MemoryLocation]: ...
 
     @overload
     def deref(
@@ -583,8 +580,7 @@ class ReachingDefinitionsState:
         pointer: Union[MultiValues, Atom, Definition, Iterable[Atom], Iterable[Definition]],
         size: Union[int, DerefSize],
         endness: str = ...,
-    ) -> Set[MemoryLocation]:
-        ...
+    ) -> Set[MemoryLocation]: ...
 
     def deref(
         self,

angr/analyses/vfg.py

@@ -370,9 +370,9 @@ class VFG(ForwardAnalysis[SimState, VFGNode, VFGJob, BlockID], Analysis):  # pyl
         self._record_function_final_states = record_function_final_states
 
         self._nodes: Dict[BlockID, VFGNode] = {}  # all the vfg nodes, keyed on block IDs
-        self._normal_states: Dict[
-            BlockID, SimState
-        ] = {}  # Last available state for each program point without widening
+        self._normal_states: Dict[BlockID, SimState] = (
+            {}
+        )  # Last available state for each program point without widening
         self._widened_states: Dict[BlockID, SimState] = {}  # States on which widening has occurred
 
         # Initial states of each function, which is context sensitive
@@ -398,9 +398,9 @@ class VFG(ForwardAnalysis[SimState, VFGNode, VFGJob, BlockID], Analysis):  # pyl
 
         self._thumb_addrs: Set[int] = set()  # set of all addresses that are code in thumb mode
 
-        self._final_address: Optional[
-            int
-        ] = None  # Address of the very last instruction. The analysis is terminated there.
+        self._final_address: Optional[int] = (
+            None  # Address of the very last instruction. The analysis is terminated there.
+        )
 
         self._function_merge_points: Dict[int, List[int]] = {}
         self._function_widening_points: Dict[int, List[int]] = {}

angr/calling_conventions.py

@@ -565,12 +565,12 @@ class SimCC:
     CALLER_SAVED_REGS: List[str] = []  # Caller-saved registers
     RETURN_ADDR: SimFunctionArgument = None  # The location where the return address is stored, as a SimFunctionArgument
     RETURN_VAL: SimFunctionArgument = None  # The location where the return value is stored, as a SimFunctionArgument
-    OVERFLOW_RETURN_VAL: Optional[
-        SimFunctionArgument
-    ] = None  # The second half of the location where a double-length return value is stored
-    FP_RETURN_VAL: Optional[
-        SimFunctionArgument
-    ] = None  # The location where floating-point argument return values are stored
+    OVERFLOW_RETURN_VAL: Optional[SimFunctionArgument] = (
+        None  # The second half of the location where a double-length return value is stored
+    )
+    FP_RETURN_VAL: Optional[SimFunctionArgument] = (
+        None  # The location where floating-point argument return values are stored
+    )
     ARCH = None  # The archinfo.Arch class that this CC must be used for, if relevant
     CALLEE_CLEANUP = False  # Whether the callee has to deallocate the stack space for the arguments
 
@@ -1423,7 +1423,15 @@ class SimCCSystemVAMD64(SimCC):
             ex_arg = arg
             # attempt to coerce the argument into a form that might show up in these lists
             if type(ex_arg) is SimRegArg:
-                regfile_offset = arch.registers[ex_arg.reg_name][0]
+                if ex_arg.reg_name not in arch.registers:
+                    # danger!
+                    # if the register name is a digit-only string, we use it as an offset
+                    try:
+                        regfile_offset = int(ex_arg.reg_name)
+                    except ValueError:
+                        return False
+                else:
+                    regfile_offset = arch.registers[ex_arg.reg_name][0]
                 while regfile_offset not in arch.register_names:
                     regfile_offset -= 1
                 ex_arg.reg_name = arch.register_names[regfile_offset]

angr/engines/soot/expressions/condition.py

@@ -29,6 +29,6 @@ class SimSootExpr_Condition(SimSootExpr):
         "ge": claripy.SGE,
         "gt": claripy.SGT,
         "le": claripy.SLE,
-        "lt": claripy.SLT
+        "lt": claripy.SLT,
         # TODO others...
     }

angr/engines/vex/claripy/irop.py

@@ -1,6 +1,7 @@
 """
 This module contains symbolic implementations of VEX operations.
 """
+
 from functools import partial
 import collections
 import itertools

angr/engines/vex/heavy/heavy.py

@@ -221,6 +221,9 @@ class HeavyVEXMixin(SuccessorsMixin, ClaripyDataMixin, SimStateStorageMixin, VEX
                     else ret_state.solver.false
                 )
                 ret_target = ret_state.solver.BVV(successors.addr + irsb.size, ret_state.arch.bits)
+                ret_state.registers.store(
+                    ret_state.arch.ret_offset, ret_state.solver.Unconstrained("fake_ret_value", ret_state.arch.bits)
+                )
                 if ret_state.arch.call_pushes_ret and not exit_jumpkind.startswith("Ijk_Sys"):
                     ret_state.regs.sp = ret_state.regs.sp + ret_state.arch.bytes
                 successors.add_successor(

angr/factory.py

@@ -289,8 +289,7 @@ class AngrObjectFactory:
         cross_insn_opt=True,
         load_from_ro_regions=False,
         initial_regs=None,
-    ) -> "Block":
-        ...
+    ) -> "Block": ...
 
     # pylint: disable=unused-argument, no-self-use, function-redefined
     @overload
@@ -312,8 +311,7 @@ class AngrObjectFactory:
         strict_block_end=None,
         collect_data_refs=False,
         cross_insn_opt=True,
-    ) -> "SootBlock":
-        ...
+    ) -> "SootBlock": ...
 
     def block(
         self,

angr/knowledge_plugins/key_definitions/live_definitions.py

@@ -846,16 +846,14 @@ class LiveDefinitions:
     @overload
     def get_concrete_value(
         self, spec: Union[Atom, Definition[Atom], Iterable[Atom], Iterable[Definition[Atom]]], cast_to: Type[int] = ...
-    ) -> Optional[int]:
-        ...
+    ) -> Optional[int]: ...
 
     @overload
     def get_concrete_value(
         self,
         spec: Union[Atom, Definition[Atom], Iterable[Atom], Iterable[Definition[Atom]]],
         cast_to: Type[bytes] = ...,
-    ) -> Optional[bytes]:
-        ...
+    ) -> Optional[bytes]: ...
 
     def get_concrete_value(
         self,
@@ -949,8 +947,7 @@ class LiveDefinitions:
         pointer: Union[MultiValues, Atom, Definition, Iterable[Atom], Iterable[Definition]],
         size: Union[int, DerefSize],
         endness: archinfo.Endness = ...,
-    ) -> Set[MemoryLocation]:
-        ...
+    ) -> Set[MemoryLocation]: ...
 
     @overload
     def deref(
@@ -958,8 +955,7 @@ class LiveDefinitions:
         pointer: Union[int, claripy.ast.BV, HeapAddress, SpOffset],
         size: Union[int, DerefSize],
         endness: archinfo.Endness = ...,
-    ) -> Optional[MemoryLocation]:
-        ...
+    ) -> Optional[MemoryLocation]: ...
 
     def deref(self, pointer, size, endness=archinfo.Endness.BE):
         if isinstance(pointer, (Atom, Definition)):

angr/knowledge_plugins/key_definitions/rd_model.py

@@ -139,14 +139,14 @@ class ReachingDefinitionsModel:
             return self.observed_results.get(key, None)
 
     @overload
-    def get_observation_by_stmt(self, codeloc: "CodeLocation", kind: ObservationPointType) -> Optional[LiveDefinitions]:
-        ...
+    def get_observation_by_stmt(
+        self, codeloc: "CodeLocation", kind: ObservationPointType
+    ) -> Optional[LiveDefinitions]: ...
 
     @overload
     def get_observation_by_stmt(
         self, node_addr: int, stmt_idx: int, kind: ObservationPointType, *, block_idx: Optional[int] = None
-    ):
-        ...
+    ): ...
 
     def get_observation_by_stmt(self, arg1, arg2, arg3=None, *, block_idx=None):
         if isinstance(arg1, int):

angr/knowledge_plugins/variables/variable_manager.py

@@ -83,9 +83,9 @@ class VariableManagerInternal(Serializable):
 
         self._variable_accesses: Dict[SimVariable, Set[VariableAccess]] = defaultdict(set)
         self._insn_to_variable: Dict[int, Set[Tuple[SimVariable, int]]] = defaultdict(set)
-        self._stmt_to_variable: Dict[
-            Union[Tuple[int, int], Tuple[int, int, int]], Set[Tuple[SimVariable, int]]
-        ] = defaultdict(set)
+        self._stmt_to_variable: Dict[Union[Tuple[int, int], Tuple[int, int, int]], Set[Tuple[SimVariable, int]]] = (
+            defaultdict(set)
+        )
         self._variable_to_stmt: Dict[SimVariable, Set[Union[Tuple[int, int], Tuple[int, int, int]]]] = defaultdict(set)
         self._atom_to_variable: Dict[
             Union[Tuple[int, int], Tuple[int, int, int]], Dict[int, Set[Tuple[SimVariable, int]]]

angr/sim_procedure.py

@@ -200,9 +200,9 @@ class SimProcedure:
             if self.arch.name in DEFAULT_CC:
                 self.cc = default_cc(
                     self.arch.name,
-                    platform=self.project.simos.name
-                    if self.project is not None and self.project.simos is not None
-                    else None,
+                    platform=(
+                        self.project.simos.name if self.project is not None and self.project.simos is not None else None
+                    ),
                 )(self.arch)
             else:
                 raise SimProcedureError(

angr/sim_type.py

@@ -2861,11 +2861,15 @@ def _decl_to_type(decl, extra_types=None, bitsize=None, arch=None) -> SimType:
             ()
             if decl.args is None
             else [
-                ...
-                if type(x) is pycparser.c_ast.EllipsisParam
-                else SimTypeBottom().with_arch(arch)
-                if type(x) is pycparser.c_ast.ID
-                else _decl_to_type(x.type, extra_types, arch=arch)
+                (
+                    ...
+                    if type(x) is pycparser.c_ast.EllipsisParam
+                    else (
+                        SimTypeBottom().with_arch(arch)
+                        if type(x) is pycparser.c_ast.ID
+                        else _decl_to_type(x.type, extra_types, arch=arch)
+                    )
+                )
                 for x in decl.args.params
             ]
         )