angr 9.2.104__tar.gz → 9.2.105__tar.gz

{angr-9.2.104/angr.egg-info → angr-9.2.105}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.104
+Version: 9.2.105
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 Home-page: https://github.com/angr/angr
 License: BSD-2-Clause
@@ -15,13 +15,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: CppHeaderParser
 Requires-Dist: GitPython
-Requires-Dist: ailment==9.2.104
-Requires-Dist: archinfo==9.2.104
+Requires-Dist: ailment==9.2.105
+Requires-Dist: archinfo==9.2.105
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.0.post1
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.104
-Requires-Dist: cle==9.2.104
+Requires-Dist: claripy==9.2.105
+Requires-Dist: cle==9.2.105
 Requires-Dist: dpkt
 Requires-Dist: itanium-demangler
 Requires-Dist: mulpyplexer
@@ -31,7 +31,7 @@ Requires-Dist: protobuf>=3.19.0
 Requires-Dist: psutil
 Requires-Dist: pycparser>=2.18
 Requires-Dist: pyformlang
-Requires-Dist: pyvex==9.2.104
+Requires-Dist: pyvex==9.2.105
 Requires-Dist: rich>=13.1.0
 Requires-Dist: rpyc
 Requires-Dist: sortedcontainers

{angr-9.2.104 → angr-9.2.105}/angr/__init__.py

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

{angr-9.2.104 → angr-9.2.105}/angr/analyses/decompiler/ail_simplifier.py

@@ -27,6 +27,7 @@ from ...knowledge_plugins.key_definitions import atoms
 from ...knowledge_plugins.key_definitions.atoms import Register as RegisterAtom
 from ...knowledge_plugins.key_definitions.definition import Definition
 from ...knowledge_plugins.key_definitions.constants import OP_BEFORE
+from ...errors import AngrRuntimeError
 from .. import Analysis, AnalysesHub
 from .ailgraph_walker import AILGraphWalker
 from .expression_narrower import ExpressionNarrowingWalker
@@ -811,9 +812,9 @@ class AILSimplifier(Analysis):
                         else:
                             replace_with = eq.atom0
                     else:
-                        raise RuntimeError("Unsupported atom1 type %s." % type(eq.atom1))
+                        raise AngrRuntimeError("Unsupported atom1 type %s." % type(eq.atom1))
                 else:
-                    raise RuntimeError("Unsupported atom0 type %s." % type(eq.atom0))
+                    raise AngrRuntimeError("Unsupported atom0 type %s." % type(eq.atom0))
 
                 to_replace_def = the_def
 

{angr-9.2.104 → angr-9.2.105}/angr/analyses/decompiler/clinic.py

@@ -1389,6 +1389,10 @@ class Clinic(Analysis):
         for block in ail_graph.nodes():
             self._link_variables_on_block(block, tmp_kb)
 
+        # Link struct member info to Store statements
+        for block in ail_graph.nodes():
+            self._link_struct_member_info_on_block(block, tmp_kb)
+
         if self._cache is not None:
             self._cache.type_constraints = vr.type_constraints
             self._cache.func_typevar = vr.func_typevar
@@ -1396,6 +1400,14 @@ class Clinic(Analysis):
 
         return tmp_kb
 
+    def _link_struct_member_info_on_block(self, block, kb):
+        variable_manager = kb.variables[self.function.addr]
+        for stmt in block.statements:
+            if isinstance(stmt, ailment.Stmt.Store) and isinstance((var := stmt.variable), SimStackVariable):
+                offset = var.offset
+                if offset in variable_manager.stack_offset_to_struct_member_info:
+                    stmt.tags["struct_member_info"] = variable_manager.stack_offset_to_struct_member_info[offset]
+
     def _link_variables_on_block(self, block, kb):
         """
         Link atoms (AIL expressions) in the given block to corresponding variables identified previously.

{angr-9.2.104 → angr-9.2.105}/angr/analyses/decompiler/condition_processor.py

@@ -15,6 +15,7 @@ from ...utils.lazy_import import lazy_import
 from ...utils import is_pyinstaller
 from ...utils.graph import dominates, inverted_idoms
 from ...block import Block, BlockNode
+from ...errors import AngrRuntimeError
 from .peephole_optimizations import InvertNegatedLogicalConjunctionsAndDisjunctions
 from .structuring.structurer_nodes import (
     MultiNode,
@@ -857,7 +858,7 @@ class ConditionProcessor:
             return claripy.true
         if isinstance(expr, sympy.logic.boolalg.BooleanFalse):
             return claripy.false
-        raise RuntimeError("Unreachable reached")
+        raise AngrRuntimeError("Unreachable reached")
 
     @staticmethod
     def simplify_condition(cond, depth_limit=8, variables_limit=8):
@@ -1024,7 +1025,7 @@ class ConditionProcessor:
                 elif arg in common_exprs:
                     continue
                 else:
-                    raise RuntimeError("Unexpected behavior - you should never reach here")
+                    raise AngrRuntimeError("Unexpected behavior - you should never reach here")
 
             return claripy.And(*common_exprs, claripy.Or(*new_args))
 

{angr-9.2.104 → angr-9.2.105}/angr/analyses/decompiler/region_identifier.py

@@ -11,6 +11,7 @@ from ailment.expression import Const
 
 from angr.utils.graph import GraphUtils
 from ...utils.graph import dfs_back_edges, subgraph_between_nodes, dominates, shallow_reverse
+from ...errors import AngrRuntimeError
 from .. import Analysis, register_analysis
 from .structuring.structurer_nodes import MultiNode, ConditionNode, IncompleteSwitchCaseHeadStatement
 from .graph_region import GraphRegion
@@ -146,7 +147,7 @@ class RegionIdentifier(Analysis):
         try:
             return next(n for n in graph.nodes() if n.addr == self.function.addr)
         except StopIteration as ex:
-            raise RuntimeError("Cannot find the start node from the graph!") from ex
+            raise AngrRuntimeError("Cannot find the start node from the graph!") from ex
 
     def _test_reducibility(self):
         # make a copy of the graph

{angr-9.2.104 → angr-9.2.105}/angr/analyses/decompiler/region_simplifiers/cascading_cond_transformer.py

@@ -5,6 +5,7 @@ import claripy
 
 from ..structuring.structurer_nodes import ConditionNode, CascadingConditionNode
 from ..sequence_walker import SequenceWalker
+from ....errors import AngrRuntimeError
 
 
 class CascadingConditionTransformer(SequenceWalker):
@@ -88,6 +89,6 @@ class CascadingConditionTransformer(SequenceWalker):
 
         else:
             # unexpected!
-            raise RuntimeError("Impossible happened")
+            raise AngrRuntimeError("Impossible happened")
 
         return CascadingConditionNode(cond_node.addr, cond_and_nodes, else_node=else_node)

{angr-9.2.104 → angr-9.2.105}/angr/analyses/decompiler/structured_codegen/c.py

@@ -37,7 +37,7 @@ from ....utils.constants import is_alignment_mask
 from ....utils.library import get_cpp_function_name
 from ....utils.loader import is_in_readonly_segment, is_in_readonly_section
 from ..utils import structured_node_is_simple_return
-from ....errors import UnsupportedNodeTypeError
+from ....errors import UnsupportedNodeTypeError, AngrRuntimeError
 from ....knowledge_plugins.cfg.memory_data import MemoryData, MemoryDataSort
 from ... import Analysis, register_analysis
 from ..region_identifier import MultiNode
@@ -1262,7 +1262,9 @@ class CFunctionCall(CStatement, CExpression):
         if self.is_expr:
             return self.prototype.returnty or SimTypeInt(signed=False).with_arch(self.codegen.project.arch)
         else:
-            raise RuntimeError("CFunctionCall.type should not be accessed if the function call is used as a statement.")
+            raise AngrRuntimeError(
+                "CFunctionCall.type should not be accessed if the function call is used as a statement."
+            )
 
     def _is_target_ambiguous(self, func_name: str) -> bool:
         """
@@ -3222,8 +3224,12 @@ class CStructuredCodeGenerator(BaseStructuredCodeGenerator, Analysis):
             return old_ty
 
         if stmt.variable is not None:
-            cvar = self._variable(stmt.variable, stmt.size)
-            offset = stmt.offset or 0
+            if "struct_member_info" in stmt.tags:
+                offset, var, _ = stmt.struct_member_info
+                cvar = self._variable(var, stmt.size)
+            else:
+                cvar = self._variable(stmt.variable, stmt.size)
+                offset = stmt.offset or 0
             assert type(offset) is int  # I refuse to deal with the alternative
 
             cdst = self._access_constant_offset(self._get_variable_reference(cvar), offset, cdata.type, True, negotiate)

{angr-9.2.104 → angr-9.2.105}/angr/analyses/flirt.py

@@ -7,6 +7,7 @@ import nampa
 from archinfo.arch_arm import is_arm_arch
 
 from ..analyses import AnalysesHub
+from ..errors import AngrRuntimeError
 from ..flirt import FlirtSignature, STRING_TO_LIBRARIES, LIBRARY_TO_SIGNATURES, FLIRT_SIGNATURES_BY_ARCH
 from .analysis import Analysis
 
@@ -49,7 +50,7 @@ class FlirtAnalysis(Analysis):
 
         else:
             if not FLIRT_SIGNATURES_BY_ARCH:
-                raise RuntimeError(
+                raise AngrRuntimeError(
                     "No FLIRT signatures exist. Please load FLIRT signatures by calling "
                     "load_signatures() before running FlirtAnalysis."
                 )

{angr-9.2.104 → angr-9.2.105}/angr/analyses/typehoon/typehoon.py

@@ -2,6 +2,7 @@
 from typing import TYPE_CHECKING
 
 from ...sim_type import SimStruct, SimTypePointer, SimTypeArray
+from ...errors import AngrRuntimeError
 from ..analysis import Analysis, AnalysesHub
 from .simple_solver import SimpleSolver
 from .translator import TypeTranslator
@@ -112,7 +113,7 @@ class Typehoon(Analysis):
         if self._var_mapping is None:
             raise ValueError("Variable mapping does not exist.")
         if self.solution is None:
-            raise RuntimeError("Please run type solver before calling pp_solution().")
+            raise AngrRuntimeError("Please run type solver before calling pp_solution().")
 
         typevar_to_var = {}
         for k, typevars in self._var_mapping.items():

{angr-9.2.104 → angr-9.2.105}/angr/analyses/variable_recovery/variable_recovery_base.py

@@ -12,6 +12,7 @@ from ailment.expression import BinaryOp, StackBaseOffset
 from ...utils.cowdict import DefaultChainMapCOW
 from ...engines.light import SpOffset
 from ...sim_variable import SimVariable
+from ...errors import AngrRuntimeError
 from ...storage.memory_mixins import MultiValuedMemory
 from ..analysis import Analysis
 from ..typehoon.typevars import TypeVariables, TypeVariable
@@ -328,7 +329,7 @@ class VariableRecoveryStateBase:
             base = 0x7F_FFFF_FFFE_0000
             mask = 0xFFFF_FFFF_FFFF_FFFF
         else:
-            raise RuntimeError("Unsupported bits %d" % self.arch.bits)
+            raise AngrRuntimeError("Unsupported bits %d" % self.arch.bits)
         return (offset + base) & mask
 
     @property

{angr-9.2.104 → angr-9.2.105}/angr/errors.py

@@ -5,6 +5,10 @@ class AngrError(Exception):
     pass
 
 
+class AngrRuntimeError(RuntimeError):
+    pass
+
+
 class AngrValueError(AngrError, ValueError):
     pass
 

{angr-9.2.104 → angr-9.2.105}/angr/exploration_techniques/__init__.py

@@ -146,6 +146,7 @@ from .bucketizer import Bucketizer
 from .local_loop_seer import LocalLoopSeer
 from .timeout import Timeout
 from .suggestions import Suggestions
+from .stub_stasher import StubStasher
 
 __all__ = (
     "ExplorationTechnique",
@@ -173,4 +174,5 @@ __all__ = (
     "LocalLoopSeer",
     "Timeout",
     "Suggestions",
+    "StubStasher",
 )

angr-9.2.105/angr/exploration_techniques/stub_stasher.py

@@ -0,0 +1,17 @@
+from . import ExplorationTechnique
+
+
+class StubStasher(ExplorationTechnique):
+    """
+    Stash states that reach a stub SimProcedure.
+    """
+
+    @staticmethod
+    def post_filter(state):
+        hook = state.project.hooked_by(state.addr)
+        return hook and hook.is_stub
+
+    def step(self, simgr, stash="active", **kwargs):
+        simgr.step(stash=stash, **kwargs)
+        simgr.move(stash, "stub", filter_func=self.post_filter)
+        return simgr

{angr-9.2.104 → angr-9.2.105}/angr/knowledge_plugins/variables/variable_manager.py

@@ -112,6 +112,8 @@ class VariableManagerInternal(Serializable):
         # optimization
         self._variables_without_writes = set()
 
+        self.stack_offset_to_struct_member_info: dict[SimStackVariable, (int, SimStackVariable, SimStruct)] = {}
+
         self.ret_val_size = None
 
     #
@@ -972,6 +974,23 @@ class VariableManagerInternal(Serializable):
                         self.variable_to_types[other_var] = ty
                         if mark_manual:
                             self.variables_with_manual_types.add(other_var)
+        if isinstance(var, SimStackVariable) and isinstance(ty, TypeRef) and isinstance(ty.type, SimStruct):
+            self.stack_offset_to_struct_member_info.update(self._extract_fields_from_struct(var, ty.type))
+
+    def _extract_fields_from_struct(self, var, ty: SimStruct, top_struct_offset=0):
+        result = {}
+        for name, field_offset in ty.offsets.items():
+            field_ty = ty.fields[name]
+            offset = top_struct_offset + field_offset
+            if isinstance(field_ty, TypeRef):
+                field_ty = field_ty.type
+            if isinstance(field_ty, SimStruct):
+                result.update(
+                    self._extract_fields_from_struct(var, field_ty, top_struct_offset=top_struct_offset + field_offset)
+                )
+            else:
+                result[var.offset + offset] = (offset, var, ty)
+        return result
 
     def get_variable_type(self, var) -> SimType | None:
         return self.variable_to_types.get(var, None)

{angr-9.2.104 → angr-9.2.105}/angr/storage/memory_mixins/paged_memory/pages/ultra_page.py

@@ -84,30 +84,50 @@ class UltraPage(MemoryObjectMixin, PageBase):
             self.symbolic_data[global_start_addr - page_addr] = new_item
             result[-1] = (global_start_addr, new_item)
 
-        for subaddr in range(addr, addr + size):
+        subaddr = addr
+        end = addr + size
+        while subaddr < end:
             realaddr = subaddr + page_addr
             if self.symbolic_bitmap[subaddr]:
                 cur_val = self._get_object(subaddr, page_addr, memory=memory)
-                if cur_val is last_run and last_run is symbolic_run:
-                    pass
+                # it must be a different object
+                cycle(realaddr)
+                next_addr = subaddr + 1
+
+                # figure out how long the current object is (limit end of page)
+                if cur_val is None:
+                    obj_end = end
                 else:
-                    cycle(realaddr)
-                    last_run = symbolic_run = cur_val
-                    result.append((realaddr, cur_val))
+                    obj_end = subaddr + cur_val.length
+                    obj_end = min(end, obj_end)
+
+                # determine how many bytes come from this object
+                # loop until: end of object or not symbolic or until next object
+                next_place = None
+                while next_addr < obj_end and self.symbolic_bitmap[next_addr]:
+                    if next_addr == subaddr + 1:  # first loop
+                        next_place = self._get_next_place(next_addr)
+                    if next_place is not None and next_place <= next_addr:
+                        break
+                    next_addr += 1
+
+                subaddr = next_addr
+                last_run = symbolic_run = cur_val
+                result.append((realaddr, cur_val))
+
             else:
-                cur_val = self.concrete_data[subaddr]
-                if last_run is concrete_run:
-                    if endness == "Iend_LE":
-                        last_run = concrete_run = concrete_run | (
-                            cur_val << (memory.state.arch.byte_width * (realaddr - result[-1][0]))
-                        )
-                    else:
-                        last_run = concrete_run = (concrete_run << memory.state.arch.byte_width) | cur_val
-                    result[-1] = (result[-1][0], concrete_run)
+                max_concrete_read = subaddr
+                while max_concrete_read < end and not self.symbolic_bitmap[max_concrete_read]:
+                    max_concrete_read += 1
+                cur_val = self.concrete_data[subaddr:max_concrete_read]
+                subaddr = max_concrete_read
+                # we know the last run was not a concrete one
+                cycle(realaddr)
+                if endness == "Iend_LE":
+                    last_run = concrete_run = cur_val[::-1]
                 else:
-                    cycle(realaddr)
                     last_run = concrete_run = cur_val
-                    result.append((realaddr, cur_val))
+                result.append((realaddr, cur_val))
 
         cycle(page_addr + addr + size)
         if not cooperate:
@@ -134,8 +154,7 @@ class UltraPage(MemoryObjectMixin, PageBase):
                 addr, data, size, endness, page_addr=page_addr, memory=memory, **kwargs
             )
 
-        if size >= memory.page_size - addr:
-            size = memory.page_size - addr
+        size = min(size, memory.page_size - addr)
 
         byte_width = memory.state.arch.byte_width
 
@@ -410,6 +429,14 @@ class UltraPage(MemoryObjectMixin, PageBase):
             else:
                 return None
 
+    def _get_next_place(self, start):
+        try:
+            place = next(self.symbolic_data.irange(minimum=start, reverse=False))
+        except StopIteration:
+            return None
+        else:
+            return place
+
     def replace_all_with_offsets(self, offsets: Iterable[int], old: claripy.ast.BV, new: claripy.ast.BV, memory=None):
         memory_objects = set()
         for offset in sorted(list(offsets)):

{angr-9.2.104 → angr-9.2.105}/angr/utils/mp.py

@@ -2,6 +2,7 @@ from typing import NamedTuple, Optional, Any
 from collections.abc import Callable
 import multiprocessing
 import platform
+from ..errors import AngrRuntimeError
 
 
 class Closure(NamedTuple):
@@ -32,7 +33,7 @@ class Initializer:
 
     def __init__(self, *, _manual: bool = True):
         if _manual:
-            raise RuntimeError("This is a singleton; call .get() instead")
+            raise AngrRuntimeError("This is a singleton; call .get() instead")
         self.initializers: list[Closure] = []
 
     def register(self, f: Callable[..., None], *args: Any, **kwargs: Any) -> None:

{angr-9.2.104 → angr-9.2.105}/angr/utils/segment_list.py

@@ -1,7 +1,7 @@
 # pylint:disable=no-else-break
 import logging
 
-from angr.errors import AngrCFGError
+from angr.errors import AngrCFGError, AngrRuntimeError
 
 
 l = logging.getLogger(name=__name__)
@@ -267,7 +267,7 @@ class SegmentList:
                     # done
                     break
                 else:
-                    raise RuntimeError("Unreachable reached")
+                    raise AngrRuntimeError("Unreachable reached")
             else:  # if segment.start > address
                 if address + size <= segment.start:
                     #                      |--- segment ---|
@@ -293,7 +293,7 @@ class SegmentList:
                     address = new_address
                     idx = self.search(address)
                 else:
-                    raise RuntimeError("Unreachable reached")
+                    raise AngrRuntimeError("Unreachable reached")
 
     def _dbg_output(self):
         """

{angr-9.2.104 → angr-9.2.105/angr.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.104
+Version: 9.2.105
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 Home-page: https://github.com/angr/angr
 License: BSD-2-Clause
@@ -15,13 +15,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: CppHeaderParser
 Requires-Dist: GitPython
-Requires-Dist: ailment==9.2.104
-Requires-Dist: archinfo==9.2.104
+Requires-Dist: ailment==9.2.105
+Requires-Dist: archinfo==9.2.105
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.0.post1
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.104
-Requires-Dist: cle==9.2.104
+Requires-Dist: claripy==9.2.105
+Requires-Dist: cle==9.2.105
 Requires-Dist: dpkt
 Requires-Dist: itanium-demangler
 Requires-Dist: mulpyplexer
@@ -31,7 +31,7 @@ Requires-Dist: protobuf>=3.19.0
 Requires-Dist: psutil
 Requires-Dist: pycparser>=2.18
 Requires-Dist: pyformlang
-Requires-Dist: pyvex==9.2.104
+Requires-Dist: pyvex==9.2.105
 Requires-Dist: rich>=13.1.0
 Requires-Dist: rpyc
 Requires-Dist: sortedcontainers

{angr-9.2.104 → angr-9.2.105}/angr.egg-info/SOURCES.txt

@@ -436,6 +436,7 @@ angr/exploration_techniques/slicecutor.py
 angr/exploration_techniques/spiller.py
 angr/exploration_techniques/spiller_db.py
 angr/exploration_techniques/stochastic.py
+angr/exploration_techniques/stub_stasher.py
 angr/exploration_techniques/suggestions.py
 angr/exploration_techniques/symbion.py
 angr/exploration_techniques/tech_builder.py

{angr-9.2.104 → angr-9.2.105}/angr.egg-info/requires.txt

@@ -1,12 +1,12 @@
 CppHeaderParser
 GitPython
-ailment==9.2.104
-archinfo==9.2.104
+ailment==9.2.105
+archinfo==9.2.105
 cachetools
 capstone==5.0.0.post1
 cffi>=1.14.0
-claripy==9.2.104
-cle==9.2.104
+claripy==9.2.105
+cle==9.2.105
 dpkt
 itanium-demangler
 mulpyplexer
@@ -16,7 +16,7 @@ protobuf>=3.19.0
 psutil
 pycparser>=2.18
 pyformlang
-pyvex==9.2.104
+pyvex==9.2.105
 rich>=13.1.0
 rpyc
 sortedcontainers

{angr-9.2.104 → angr-9.2.105}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=59", "wheel", "pyvex==9.2.104", "unicorn==2.0.1.post1"]
+requires = ["setuptools>=59", "wheel", "pyvex==9.2.105", "unicorn==2.0.1.post1"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]

{angr-9.2.104 → angr-9.2.105}/setup.cfg

@@ -20,13 +20,13 @@ packages = find:
 install_requires = 
 	CppHeaderParser
 	GitPython
-	ailment==9.2.104
-	archinfo==9.2.104
+	ailment==9.2.105
+	archinfo==9.2.105
 	cachetools
 	capstone==5.0.0.post1
 	cffi>=1.14.0
-	claripy==9.2.104
-	cle==9.2.104
+	claripy==9.2.105
+	cle==9.2.105
 	dpkt
 	itanium-demangler
 	mulpyplexer
@@ -36,7 +36,7 @@ install_requires =
 	psutil
 	pycparser>=2.18
 	pyformlang
-	pyvex==9.2.104
+	pyvex==9.2.105
 	rich>=13.1.0
 	rpyc
 	sortedcontainers