angr 9.2.117__py3-none-manylinux2014_aarch64.whl → 9.2.119__py3-none-manylinux2014_aarch64.whl

angr/engines/vex/lifter.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from cachetools import LRUCache
@@ -147,27 +148,20 @@ class VEXLifter(SimEngineBase):
         if num_inst is None and self._single_step:
             num_inst = 1
         if opt_level is None:
-            if state and o.OPTIMIZE_IR in state.options:
-                opt_level = 1
-            else:
-                opt_level = self._default_opt_level
+            opt_level = 1 if state and o.OPTIMIZE_IR in state.options else self._default_opt_level
         if cross_insn_opt is None:
-            if state and o.NO_CROSS_INSN_OPT in state.options:
-                cross_insn_opt = False
-            else:
-                cross_insn_opt = True
+            cross_insn_opt = not (state and o.NO_CROSS_INSN_OPT in state.options)
         if strict_block_end is None:
             strict_block_end = self.default_strict_block_end
-        if self.selfmodifying_code:
-            if opt_level > 0:
-                if once("vex-engine-smc-opt-warning"):
-                    l.warning(
-                        "Self-modifying code is not always correctly optimized by PyVEX. "
-                        "To guarantee correctness, VEX optimizations have been disabled."
-                    )
-                opt_level = 0
-                if state and o.OPTIMIZE_IR in state.options:
-                    state.options.remove(o.OPTIMIZE_IR)
+        if self.selfmodifying_code and opt_level > 0:
+            if once("vex-engine-smc-opt-warning"):
+                l.warning(
+                    "Self-modifying code is not always correctly optimized by PyVEX. "
+                    "To guarantee correctness, VEX optimizations have been disabled."
+                )
+            opt_level = 0
+            if state and o.OPTIMIZE_IR in state.options:
+                state.options.remove(o.OPTIMIZE_IR)
         if skip_stmts is not True:
             skip_stmts = False
         if offset is None:
@@ -200,15 +194,13 @@ class VEXLifter(SimEngineBase):
                 stop_point = self._first_stoppoint(irsb, extra_stop_points)
                 if stop_point is None:
                     return irsb
-                else:
-                    size = stop_point - addr
-                    # check the cache again
-                    cache_key = (addr, insn_bytes, size, num_inst, thumb, opt_level, strict_block_end, cross_insn_opt)
-                    if cache_key in self._block_cache:
-                        self._block_cache_hits += 1
-                        return self._block_cache[cache_key]
-                    else:
-                        self._block_cache_misses += 1
+                size = stop_point - addr
+                # check the cache again
+                cache_key = (addr, insn_bytes, size, num_inst, thumb, opt_level, strict_block_end, cross_insn_opt)
+                if cache_key in self._block_cache:
+                    self._block_cache_hits += 1
+                    return self._block_cache[cache_key]
+                self._block_cache_misses += 1
             else:
                 # a special case: `size` is used as the maximum allowed size
                 tmp_cache_key = (
@@ -247,9 +239,9 @@ class VEXLifter(SimEngineBase):
 
         if isinstance(buff, claripy.ast.BV):  # pylint:disable=isinstance-second-argument-not-valid-type
             if len(buff) == 0:
-                raise SimEngineError("No bytes in memory for block starting at %#x." % addr)
+                raise SimEngineError(f"No bytes in memory for block starting at {addr:#x}.")
         elif not buff:
-            raise SimEngineError("No bytes in memory for block starting at %#x." % addr)
+            raise SimEngineError(f"No bytes in memory for block starting at {addr:#x}.")
 
         # phase 5: call into pyvex
         l.debug("Creating IRSB of %s at %#x", arch, addr)
@@ -331,7 +323,7 @@ class VEXLifter(SimEngineBase):
                                 "think you ought to be able to, open an issue."
                             )
                         else:
-                            raise TypeError("Unsupported backer type %s." % type(backer))
+                            raise TypeError(f"Unsupported backer type {type(backer)}.")
             elif state:
                 if state.memory.SUPPORTS_CONCRETE_LOAD:
                     buff = state.memory.concrete_load(addr, max_size)
@@ -389,11 +381,12 @@ class VEXLifter(SimEngineBase):
         return None
 
     def __is_stop_point(self, addr, extra_stop_points=None):
-        if self.project is not None and addr in self.project._sim_procedures:
-            return True
-        elif extra_stop_points is not None and addr in extra_stop_points:
-            return True
-        return False
+        return bool(
+            self.project is not None
+            and addr in self.project._sim_procedures
+            or extra_stop_points is not None
+            and addr in extra_stop_points
+        )
 
     def __getstate__(self):
         ostate = super().__getstate__()

angr/engines/vex/light/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .light import VEXMixin
 from .resilience import VEXResilienceMixin
 from .slicing import VEXSlicingMixin

angr/engines/vex/light/light.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 import pyvex
@@ -399,10 +400,7 @@ class VEXMixin(SimEngineBase):
         load_result = self._perform_vex_stmt_LoadG_load(
             addr, ty, end, condition=self._perform_vex_stmt_LoadG_guard_condition(guard)
         )
-        if cvt_op is None:
-            cvt_result = load_result
-        else:
-            cvt_result = self._perform_vex_stmt_LoadG_widen(cvt_op, (load_result,))
+        cvt_result = load_result if cvt_op is None else self._perform_vex_stmt_LoadG_widen(cvt_op, (load_result,))
         ite_result = self._perform_vex_stmt_LoadG_ite(guard, cvt_result, alt)
         self._perform_vex_stmt_LoadG_wrtmp(dst, ite_result)
 

angr/engines/vex/light/resilience.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from angr.engines.vex.light import VEXMixin
 from angr import errors
 

angr/engines/vex/light/slicing.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .light import VEXMixin
 from ....utils.constants import DEFAULT_STATEMENT
 

angr/errors.py

@@ -1,4 +1,5 @@
 # pylint:disable=missing-class-docstring
+from __future__ import annotations
 
 
 class AngrError(Exception):
@@ -564,7 +565,7 @@ class SimSegfaultException(SimException, SimMemoryError):
         return "SimSegfaultException({:#x} ({}{})".format(
             self.addr,
             self.reason,
-            (", original %s" % self.original_addr.__repr__(max_depth=3)) if self.original_addr is not None else "",
+            (f", original {self.original_addr.__repr__(max_depth=3)}") if self.original_addr is not None else "",
         )
 
     def __reduce__(self):
@@ -604,5 +605,9 @@ class SimConcreteBreakpointError(AngrError):
 #
 
 
+class AngrDecompilationError(AngrError):
+    pass
+
+
 class UnsupportedNodeTypeError(AngrError, NotImplementedError):
     pass

angr/exploration_techniques/__init__.py

@@ -1,4 +1,5 @@
 # pylint:disable=unused-import,missing-class-docstring,wrong-import-position
+from __future__ import annotations
 import angr  # For type annotations
 
 
@@ -17,9 +18,9 @@ class ExplorationTechnique:
     _hook_list = ("step", "filter", "selector", "step_state", "successors")
 
     def _get_hooks(self):
-        return {name: getattr(self, name) for name in self._hook_list if self._is_overriden(name)}
+        return {name: getattr(self, name) for name in self._hook_list if self._is_overridden(name)}
 
-    def _is_overriden(self, name):
+    def _is_overridden(self, name):
         return getattr(self, name).__code__ is not getattr(ExplorationTechnique, name).__code__
 
     def __init__(self):

angr/exploration_techniques/bucketizer.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import math
 from collections import defaultdict
 import logging
@@ -91,6 +92,4 @@ class Bucketizer(ExplorationTechnique):
             return True
 
         n = math.log2(t[transition])
-        if n.is_integer():
-            return True
-        return False
+        return bool(n.is_integer())

angr/exploration_techniques/common.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from .. import engines
 from ..errors import SimError, AngrError, AngrExplorationTechniqueError
 
@@ -44,13 +45,12 @@ def condition_to_lambda(condition, default=False):
             except (AngrError, SimError):
                 return False
 
-    elif hasattr(condition, "__call__"):
+    elif callable(condition):
         condition_function = condition
         static_addrs = None
     else:
         raise AngrExplorationTechniqueError(
-            "ExplorationTechnique is unable to convert given type (%s) to a callable condition function."
-            % condition.__class__
+            f"ExplorationTechnique is unable to convert given type ({condition.__class__}) to a callable condition function."
         )
 
     return condition_function, static_addrs

angr/exploration_techniques/dfs.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from . import ExplorationTechnique
 import random
 

angr/exploration_techniques/director.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 from collections import defaultdict
 
@@ -21,7 +22,7 @@ class BaseGoal:
         self.sort = sort
 
     def __repr__(self):
-        return "<TargetCondition %s>" % self.sort
+        return f"<TargetCondition {self.sort}>"
 
     #
     # Public methods
@@ -38,7 +39,7 @@ class BaseGoal:
         :rtype: bool
         """
 
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def check_state(self, state):
         """
@@ -49,7 +50,7 @@ class BaseGoal:
         :rtype: bool
         """
 
-        raise NotImplementedError()
+        raise NotImplementedError
 
     #
     # Private methods
@@ -121,7 +122,7 @@ class ExecuteAddressGoal(BaseGoal):
         self.addr = addr
 
     def __repr__(self):
-        return "<ExecuteAddressCondition targeting %#x>" % self.addr
+        return f"<ExecuteAddressCondition targeting {self.addr:#x}>"
 
     def check(self, cfg, state, peek_blocks):
         """
@@ -200,7 +201,7 @@ class CallFunctionGoal(BaseGoal):
         # TODO: allow user to provide an optional argument processor to process arguments
 
     def __repr__(self):
-        return "<FunctionCallCondition over %s>" % self.function
+        return f"<FunctionCallCondition over {self.function}>"
 
     def check(self, cfg, state, peek_blocks):
         """
@@ -232,15 +233,14 @@ class CallFunctionGoal(BaseGoal):
                     # we do not care about arguments
                     return True
 
-                else:
-                    # check arguments
-                    arch = state.arch
-                    state = the_node.input_state
-                    same_arguments = self._check_arguments(arch, state)
+                # check arguments
+                arch = state.arch
+                state = the_node.input_state
+                same_arguments = self._check_arguments(arch, state)
 
-                    if same_arguments:
-                        # all arguments are the same!
-                        return True
+                if same_arguments:
+                    # all arguments are the same!
+                    return True
 
         l.debug("SimState %s will not reach function %s.", state, self.function)
         return False
@@ -272,7 +272,7 @@ class CallFunctionGoal(BaseGoal):
         cc = default_cc(arch.name, platform=state.project.simos.name if state.project.simos is not None else None)(arch)
         real_args = cc.get_args(state, cc.guess_prototype([0] * len(self.arguments)))
 
-        for i, (expected_arg, real_arg) in enumerate(zip(self.arguments, real_args)):
+        for _i, (expected_arg, real_arg) in enumerate(zip(self.arguments, real_args)):
             if expected_arg is None:
                 continue
 
@@ -309,8 +309,7 @@ class CallFunctionGoal(BaseGoal):
                 ptr = real_value
                 return CallFunctionGoal._compare_pointer_content(state, ptr, expected_value)
 
-            else:
-                l.error("Unsupported argument type %s in _compare_arguments(). Please bug Fish to implement.", arg_type)
+            l.error("Unsupported argument type %s in _compare_arguments(). Please bug Fish to implement.", arg_type)
 
         elif isinstance(arg_type, SimTypeString):
             # resolve the pointer and compare the content
@@ -487,9 +486,8 @@ class Director(ExplorationTechnique):
 
         for goal in self._goals:
             for p in simgr.active:
-                if self._check_goals(goal, p):
-                    if self._goal_satisfied_callback is not None:
-                        self._goal_satisfied_callback(goal, p, simgr)
+                if self._check_goals(goal, p) and self._goal_satisfied_callback is not None:
+                    self._goal_satisfied_callback(goal, p, simgr)
 
         simgr.stash(
             filter_func=lambda p: all(

angr/exploration_techniques/driller_core.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 from itertools import islice
 
@@ -93,12 +94,7 @@ class DrillerCore(ExplorationTechnique):
     @staticmethod
     def _has_false(state):
         # Check if the state is unsat even if we remove preconstraints.
-        claripy_false = claripy.false
-        if state.scratch.guard.cache_key == claripy_false.cache_key:
+        if state.scratch.guard.identical(claripy.false()):
             return True
 
-        for c in state.solver.constraints:
-            if c.cache_key == claripy_false.cache_key:
-                return True
-
-        return False
+        return any(c.identical(claripy.false()) for c in state.solver.constraints)

angr/exploration_techniques/explorer.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 import claripy
 
@@ -136,9 +137,12 @@ class Explorer(ExplorationTechnique):
             resource_event(state, e)
             return "interrupted"
 
-        if self.cfg is not None and self.cfg.model.get_any_node(state.addr) is not None:
-            if state.addr not in self.ok_blocks:
-                return self.avoid_stash
+        if (
+            self.cfg is not None
+            and self.cfg.model.get_any_node(state.addr) is not None
+            and state.addr not in self.ok_blocks
+        ):
+            return self.avoid_stash
 
         return None
 

angr/exploration_techniques/lengthlimiter.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from . import ExplorationTechnique
 
 

angr/exploration_techniques/local_loop_seer.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 from collections import defaultdict
 
@@ -35,8 +36,7 @@ class LocalLoopSeer(ExplorationTechnique):
         if state in self.cut_succs:
             self.cut_succs.remove(state)
             return self.discard_stash
-        else:
-            return simgr.filter(state, **kwargs)
+        return simgr.filter(state, **kwargs)
 
     def successors(self, simgr, state, **kwargs):
         succs = simgr.successors(state, **kwargs)

angr/exploration_techniques/loop_seer.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from . import ExplorationTechnique
@@ -80,7 +81,7 @@ class LoopSeer(ExplorationTechnique):
                 func = self._get_function(f)
                 if func is not None:
                     funcs.append(func)
-            funcs = None if not funcs else funcs
+            funcs = funcs if funcs else None
 
         elif self.functions is not None:
             raise TypeError("Invalid type for 'functions' parameter!")
@@ -97,8 +98,7 @@ class LoopSeer(ExplorationTechnique):
         if state in self.cut_succs:
             self.cut_succs.remove(state)
             return self.discard_stash
-        else:
-            return simgr.filter(state, **kwargs)
+        return simgr.filter(state, **kwargs)
 
     def successors(self, simgr, state, **kwargs):
         node = self.cfg.model.get_any_node(state.addr)
@@ -111,14 +111,13 @@ class LoopSeer(ExplorationTechnique):
         # chose not to take it (e.g., the loop is not concrete), increase the trip count
         at_loop_exit = False
         for succ_state in succs.successors:
-            if succ_state.loop_data.current_loop:
-                if succ_state.addr in succ_state.loop_data.current_loop[-1][1]:
-                    l.debug(
-                        "One of the successors: %s is at the exit of the current loop %s",
-                        hex(succ_state.addr),
-                        succ_state.loop_data.current_loop[-1][0],
-                    )
-                    at_loop_exit = True
+            if succ_state.loop_data.current_loop and succ_state.addr in succ_state.loop_data.current_loop[-1][1]:
+                l.debug(
+                    "One of the successors: %s is at the exit of the current loop %s",
+                    hex(succ_state.addr),
+                    succ_state.loop_data.current_loop[-1][0],
+                )
+                at_loop_exit = True
 
         for succ_state in succs.successors:
             # Processing a currently running loop
@@ -214,9 +213,7 @@ class LoopSeer(ExplorationTechnique):
     # pylint: disable=R0201
     def _inside_current_loops(self, succ_state):
         current_loops_addrs = [x[0].entry.addr for x in succ_state.loop_data.current_loop]
-        if succ_state.addr in current_loops_addrs:
-            return True
-        return False
+        return succ_state.addr in current_loops_addrs
 
     def _get_function(self, func):
         f = None

angr/exploration_techniques/manual_mergepoint.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from . import ExplorationTechnique
@@ -13,7 +14,7 @@ class ManualMergepoint(ExplorationTechnique):
         self.prune = prune
         self.wait_counter = 0
         self.stash = f"merge_waiting_{self.address:#x}_{id(self):x}"
-        self.filter_marker = "skip_next_filter_%#x" % self.address
+        self.filter_marker = f"skip_next_filter_{self.address:#x}"
 
     def setup(self, simgr):
         simgr.stashes[self.stash] = []
@@ -71,7 +72,7 @@ class ManualMergepoint(ExplorationTechnique):
         while len(simgr.stashes[self.stash]):
             num_unique += 1
             exemplar_callstack = simgr.stashes[self.stash][0].callstack
-            simgr.move(self.stash, "merge_tmp", lambda s: s.callstack == exemplar_callstack)
+            simgr.move(self.stash, "merge_tmp", lambda s, ec=exemplar_callstack: s.callstack == ec)
             l.debug("...%d with unique callstack #%d", len(simgr.merge_tmp), num_unique)
             if len(simgr.merge_tmp) > 1:
                 simgr = simgr.merge(stash="merge_tmp", prune=self.prune)

angr/exploration_techniques/memory_watcher.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from . import ExplorationTechnique
 import psutil
 

angr/exploration_techniques/oppologist.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 import functools
 
@@ -83,11 +84,10 @@ class Oppologist(ExplorationTechnique):
             try:
                 if e.executed_instruction_count:
                     return self._delayed_oppology(simgr, state, e, **kwargs)
-                else:
-                    return self._oppologize(simgr, state, state.copy(), **kwargs)
-            except exc_list:  # pylint:disable=broad-except
+                return self._oppologize(simgr, state, state.copy(), **kwargs)
+            except exc_list as err:
                 l.error("Oppologizer hit an error while trying to perform repairs", exc_info=True)
-                raise e
+                raise e from err
         except Exception:  # pylint:disable=broad-except
             l.error("Original block hit an unsupported error", exc_info=True)
             raise

angr/exploration_techniques/slicecutor.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from ..errors import AngrExitError
 from . import ExplorationTechnique
 

angr/exploration_techniques/spiller.py

@@ -1,4 +1,7 @@
 # pylint:disable=no-member,import-outside-toplevel
+from __future__ import annotations
+
+import contextlib
 import logging
 
 from . import ExplorationTechnique
@@ -17,7 +20,7 @@ class PickledStatesBase:
         Sort pickled states.
         """
 
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def add(self, prio, sid):
         """
@@ -27,7 +30,7 @@ class PickledStatesBase:
         :param str sid:     Persistent ID of the state.
         :return:            None
         """
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def pop_n(self, n):
         """
@@ -36,7 +39,7 @@ class PickledStatesBase:
         :param int n:   Number of states to take.
         :return:        A list of states.
         """
-        raise NotImplementedError()
+        raise NotImplementedError
 
 
 class PickledStatesList(PickledStatesBase):
@@ -75,12 +78,9 @@ class PickledStatesDb(PickledStatesBase):
         # ORM declarations
         engine = create_engine(db_str)
 
-        # create table
-        try:
+        # create table (unless it already exists)
+        with contextlib.suppress(OperationalError):
             Base.metadata.create_all(engine, checkfirst=True)
-        except OperationalError:
-            # table already exists
-            pass
 
         self.Session = sessionmaker(bind=engine)
 

angr/exploration_techniques/spiller_db.py

@@ -1,4 +1,5 @@
 # pylint:disable=missing-class-docstring,unused-import
+from __future__ import annotations
 import datetime
 
 try:

angr/exploration_techniques/stochastic.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import random
 from collections import defaultdict
 
@@ -47,10 +48,8 @@ class StochasticSearch(ExplorationTechnique):
                     weight = self.affinity[state.addr]
                     if selected < weight:
                         break
-                    else:
-                        selected -= weight
-                picked = states[i]
-                return picked
+                    selected -= weight
+                return states[i]
 
             simgr.stashes[stash] = [weighted_pick(simgr.stashes[stash])]
 

angr/exploration_techniques/stub_stasher.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from . import ExplorationTechnique
 
 

angr/exploration_techniques/suggestions.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 import claripy
 
@@ -19,12 +20,12 @@ def ast_weight(ast, memo=None):
     if memo is None:
         memo = {}
 
-    result = memo.get(ast.cache_key, None)
+    result = memo.get(ast.hash(), None)
     if result is not None:
         return result
 
     result = 1 + sum(ast_weight(arg, memo) for arg in ast.args)
-    memo[ast.cache_key] = result
+    memo[ast.hash()] = result
     return result
 
 
@@ -68,11 +69,11 @@ class Suggestions(ExplorationTechnique):
         if event.objects["type"] is claripy.errors.ClaripySolverInterruptError:
             if event.objects["reason"][0] == "timeout":
                 limit_number = state.solver._solver.timeout
-                limit_kind = "hit a solver timeout of %s ms." % limit_number
+                limit_kind = f"hit a solver timeout of {limit_number} ms."
                 limit_minimum = 60 * 1000
             elif event.objects["reason"][0] == "max. memory exceeded":
                 limit_number = state.solver._solver.max_memory
-                limit_kind = "hit a solver memory limit of %s MB." % limit_number
+                limit_kind = f"hit a solver memory limit of {limit_number} MB."
                 limit_minimum = 1024
             else:
                 limit_number = None

angr/exploration_techniques/symbion.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 from .common import condition_to_lambda
 from . import ExplorationTechnique

angr/exploration_techniques/tech_builder.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from . import ExplorationTechnique
 
 

angr/exploration_techniques/threading.py

@@ -1,4 +1,5 @@
 # pylint: disable=cell-var-from-loop
+from __future__ import annotations
 import concurrent.futures
 import logging
 

angr/exploration_techniques/timeout.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import time
 import logging
 from . import ExplorationTechnique