angr 9.2.121__py3-none-win_amd64.whl → 9.2.122__py3-none-win_amd64.whl

angr/__init__.py

@@ -2,7 +2,7 @@
 # pylint: disable=wrong-import-position
 from __future__ import annotations
 
-__version__ = "9.2.121"
+__version__ = "9.2.122"
 
 if bytes is str:
     raise Exception(

angr/analyses/decompiler/callsite_maker.py

@@ -8,7 +8,7 @@ from ailment import Stmt, Expr, Const
 
 from angr.procedures.stubs.format_parser import FormatParser, FormatSpecifier
 from angr.sim_type import SimTypeBottom, SimTypePointer, SimTypeChar, SimTypeInt, dereference_simtype
-from angr.calling_conventions import SimRegArg, SimStackArg, SimCC, SimStructArg
+from angr.calling_conventions import SimRegArg, SimStackArg, SimCC, SimStructArg, SimComboArg
 from angr.knowledge_plugins.key_definitions.constants import OP_BEFORE
 from angr.analyses import Analysis, register_analysis
 from angr.analyses.s_reaching_definitions import SRDAView
@@ -129,7 +129,17 @@ class CallSiteMaker(Analysis):
                         arg_locs = cc.arg_locs(callsite_ty)
 
         if arg_locs is not None:
+            expanded_arg_locs = []
             for arg_loc in arg_locs:
+                if isinstance(arg_loc, SimComboArg):
+                    # a ComboArg spans across multiple locations (mostly stack but *in theory* can also be spanning
+                    # across registers). most importantly, a ComboArg represents one variable, not multiple, but we
+                    # have no way to know that until later down the pipeline.
+                    expanded_arg_locs += arg_loc.locations
+                else:
+                    expanded_arg_locs.append(arg_loc)
+
+            for arg_loc in expanded_arg_locs:
                 if isinstance(arg_loc, SimRegArg):
                     size = arg_loc.size
                     offset = arg_loc.check_offset(cc.arch)

angr/sim_type.py

@@ -1,4 +1,4 @@
-# pylint:disable=abstract-method,line-too-long,missing-class-docstring,wrong-import-position
+# pylint:disable=abstract-method,line-too-long,missing-class-docstring,wrong-import-position,too-many-positional-arguments
 from __future__ import annotations
 
 import contextlib
@@ -19,7 +19,6 @@ from angr.sim_state import SimState
 from .misc.ux import deprecated
 
 if TYPE_CHECKING:
-    import pycparser
     from angr.procedures.definitions import SimTypeCollection
     from angr.storage.memory_mixins import _Coerce
 
@@ -120,7 +119,8 @@ class SimType:
         if self._arch is None:
             raise ValueError("Can't tell my alignment without an arch!")
         if self.size is None:
-            raise AngrTypeError("Cannot compute the alignment of a type with no size")
+            l.debug("The size of the type %r is unknown; assuming word size of the arch.", self)
+            return self._arch.bytes
         return self.size // self._arch.byte_width
 
     def with_arch(self, arch: Arch | None):
@@ -214,7 +214,9 @@ class TypeRef(SimType):
         self.type = self.type.with_arch(arch)
         return self
 
-    def c_repr(self, name=None, full=0, memo=None, indent=0):
+    def c_repr(
+        self, name=None, full=0, memo=None, indent=0, name_parens: bool = True
+    ):  # pylint: disable=unused-argument
         if not full:
             if name is not None:
                 return f"{self.name} {name}"
@@ -265,7 +267,9 @@ class SimTypeBottom(SimType):
     def __repr__(self):
         return self.label or "BOT"
 
-    def c_repr(self, name=None, full=0, memo=None, indent=0):
+    def c_repr(
+        self, name=None, full=0, memo=None, indent=0, name_parens: bool = True
+    ):  # pylint: disable=unused-argument
         if name is None:
             return "int"
         return f'{"int" if self.label is None else self.label} {name}'
@@ -408,7 +412,9 @@ class SimTypeInt(SimTypeReg):
         super().__init__(None, label=label)
         self.signed = signed
 
-    def c_repr(self, name=None, full=0, memo=None, indent=0):
+    def c_repr(
+        self, name=None, full=0, memo=None, indent=0, name_parens: bool = True
+    ):  # pylint: disable=unused-argument
         out = self._base_name
         if not self.signed:
             out = "unsigned " + out
@@ -736,7 +742,9 @@ class SimTypePointer(SimTypeReg):
     def __repr__(self):
         return f"{self.pts_to}*"
 
-    def c_repr(self, name=None, full=0, memo=None, indent=0):
+    def c_repr(
+        self, name=None, full=0, memo=None, indent=0, name_parens: bool = True
+    ):  # pylint: disable=unused-argument
         # if pts_to is SimTypeBottom, we return a void*
         if isinstance(self.pts_to, SimTypeBottom):
             out = "void*"
@@ -803,7 +811,9 @@ class SimTypeReference(SimTypeReg):
     def __repr__(self):
         return f"{self.refs}&"
 
-    def c_repr(self, name=None, full=0, memo=None, indent=0):
+    def c_repr(
+        self, name=None, full=0, memo=None, indent=0, name_parens: bool = True
+    ):  # pylint: disable=unused-argument
         name = "&" if name is None else f"&{name}"
         return self.refs.c_repr(name, full, memo, indent)
 
@@ -869,7 +879,9 @@ class SimTypeArray(SimType):
     def __repr__(self):
         return "{}[{}]".format(self.elem_type, "" if self.length is None else self.length)
 
-    def c_repr(self, name=None, full=0, memo=None, indent=0):
+    def c_repr(
+        self, name=None, full=0, memo=None, indent=0, name_parens: bool = True
+    ):  # pylint: disable=unused-argument
         if name is None:
             return repr(self)
 
@@ -958,7 +970,9 @@ class SimTypeString(NamedTypeMixin, SimType):
     def __repr__(self):
         return "string_t"
 
-    def c_repr(self, name=None, full=0, memo=None, indent=0):
+    def c_repr(
+        self, name=None, full=0, memo=None, indent=0, name_parens: bool = True
+    ):  # pylint: disable=unused-argument
         if name is None:
             return repr(self)
 
@@ -1034,7 +1048,9 @@ class SimTypeWString(NamedTypeMixin, SimType):
     def __repr__(self):
         return "wstring_t"
 
-    def c_repr(self, name=None, full=0, memo=None, indent=0):
+    def c_repr(
+        self, name=None, full=0, memo=None, indent=0, name_parens: bool = True
+    ):  # pylint: disable=unused-argument
         if name is None:
             return repr(self)
 
@@ -1339,15 +1355,27 @@ class SimTypeDouble(SimTypeFloat):
 
 
 class SimStruct(NamedTypeMixin, SimType):
-    _fields = ("name", "fields")
+    _fields = ("name", "fields", "anonymous")
 
-    def __init__(self, fields: dict[str, SimType] | OrderedDict[str, SimType], name=None, pack=False, align=None):
+    def __init__(
+        self,
+        fields: dict[str, SimType] | OrderedDict[str, SimType],
+        name=None,
+        pack=False,
+        align=None,
+        anonymous: bool = False,
+    ):
         super().__init__(None, name="<anon>" if name is None else name)
 
         self._pack = pack
         self._align = align
+        self.anonymous = anonymous
         self.fields: OrderedDict[str, SimType] = OrderedDict(fields)
 
+        # FIXME: Hack for supporting win32 struct definitions
+        if self.name == "_Anonymous_e__Struct":
+            self.anonymous = True
+
         self._arch_memo = {}
 
     @property
@@ -1363,7 +1391,7 @@ class SimStruct(NamedTypeMixin, SimType):
         offset_so_far = 0
         for name, ty in self.fields.items():
             if ty.size is None:
-                l.warning(
+                l.debug(
                     "Found a bottom field in struct %s. Ignore and increment the offset using the default "
                     "element size.",
                     self.name,
@@ -1418,7 +1446,9 @@ class SimStruct(NamedTypeMixin, SimType):
     def __repr__(self):
         return f"struct {self.name}"
 
-    def c_repr(self, name=None, full=0, memo=None, indent=0):
+    def c_repr(
+        self, name=None, full=0, memo=None, indent=0, name_parens: bool = True
+    ):  # pylint: disable=unused-argument
         if not full or (memo is not None and self in memo):
             return super().c_repr(name, full, memo, indent)
 
@@ -1632,7 +1662,9 @@ class SimUnion(NamedTypeMixin, SimType):
             self.name, "\n\t".join(f"{name} {ty!s};" for name, ty in self.members.items())
         )
 
-    def c_repr(self, name=None, full=0, memo=None, indent=0):
+    def c_repr(
+        self, name=None, full=0, memo=None, indent=0, name_parens: bool = True
+    ):  # pylint: disable=unused-argument
         if not full or (memo is not None and self in memo):
             return super().c_repr(name, full, memo, indent)
 
@@ -1875,7 +1907,9 @@ class SimTypeRef(SimType):
     def set_size(self, v: int):
         self._size = v
 
-    def c_repr(self, name=None, full=0, memo=None, indent=0) -> str:
+    def c_repr(
+        self, name=None, full=0, memo=None, indent=0, name_parens: bool = True
+    ) -> str:  # pylint: disable=unused-argument
         prefix = "unknown"
         if self.original_type is SimStruct:
             prefix = "struct"
@@ -3537,7 +3571,8 @@ def dereference_simtype(
             return memo[t.name]
 
         real_type = t.copy()
-        memo[t.name] = real_type
+        if not t.anonymous:
+            memo[t.name] = real_type
         fields = OrderedDict((k, dereference_simtype(v, type_collections, memo=memo)) for k, v in t.fields.items())
         real_type.fields = fields
     elif isinstance(t, SimTypePointer):

{angr-9.2.121.dist-info → angr-9.2.122.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.121
+Version: 9.2.122
 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.121
-Requires-Dist: archinfo==9.2.121
+Requires-Dist: ailment==9.2.122
+Requires-Dist: archinfo==9.2.122
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.3
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.121
-Requires-Dist: cle==9.2.121
+Requires-Dist: claripy==9.2.122
+Requires-Dist: cle==9.2.122
 Requires-Dist: itanium-demangler
 Requires-Dist: mulpyplexer
 Requires-Dist: nampa
@@ -30,7 +30,7 @@ Requires-Dist: protobuf>=5.28.2
 Requires-Dist: psutil
 Requires-Dist: pycparser>=2.18
 Requires-Dist: pyformlang
-Requires-Dist: pyvex==9.2.121
+Requires-Dist: pyvex==9.2.122
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy

{angr-9.2.121.dist-info → angr-9.2.122.dist-info}/RECORD

@@ -1,4 +1,4 @@
-angr/__init__.py,sha256=sn4JB3PDK88kv9Zl63UWZmIIgadNc2VcTyw9WUdjML8,9153
+angr/__init__.py,sha256=FvLCWVY2NPQsA6BMek9XDtGgFw8K_KwQEOhf__rdJpk,9153
 angr/__main__.py,sha256=XeawhF6Cco9eWcfMTDWzYYggLB3qjnQ87IIeFOplaHM,2873
 angr/annocfg.py,sha256=5fiS9TPt5r1_8g_qSfD2XkETlBdm5MTClBIQKqhm040,10624
 angr/blade.py,sha256=GpbEumxMsb_6qD7TbtfZuW2CMzV7W1iwqYzQWYlXnxM,15394
@@ -20,7 +20,7 @@ angr/sim_options.py,sha256=tfl57MFECmA7uvMMtQrRRbpG8g_A9jKOzwY6nApTW6Y,17782
 angr/sim_procedure.py,sha256=hvd180bGmjB2skK93gVfy_W9fNUtI5pAD3upGqgSUJ8,26221
 angr/sim_state.py,sha256=XokLIEd7Cxod86BvVuhJEA8wUxYa_cSGn7M9BIMmbNQ,33305
 angr/sim_state_options.py,sha256=OBsH55qwd1FacVL3Uabqjgos-x5BhpdONSnhxkueRwI,12468
-angr/sim_type.py,sha256=xrZiNC7uog6ncDKavL4qkh7iUukE5sVEYI5yKG7b6ME,131053
+angr/sim_type.py,sha256=RcIDyMjQ0ochnKDt_Tflbwmw8exyj86R-KimR3tDGGE,132236
 angr/sim_variable.py,sha256=oN0EIj8Y7vpdZgX0Hp8OMix40EvAvFBmNSH2KkgtAPM,16404
 angr/slicer.py,sha256=74ujgNMKcEIHM8lqal69Cbls07yCxpxvi-jUYeScfaU,10668
 angr/state_hierarchy.py,sha256=qDQCUGXmQm3vOxE3CSoiqTH4OAFFOWZZt9BLhNpeOhA,8484
@@ -97,7 +97,7 @@ angr/analyses/decompiler/ailgraph_walker.py,sha256=m71HCthOr9J8PZoMxJzCPskay8yfC
 angr/analyses/decompiler/block_io_finder.py,sha256=xMwG8Bi69OGNYVs0U0F4yxM8kEsnyrsMrf0gEr8dOEw,10923
 angr/analyses/decompiler/block_similarity.py,sha256=ISMoOm-TGJ_1wD2i_4m8IYTletgnP66gReQESJnfvS0,6873
 angr/analyses/decompiler/block_simplifier.py,sha256=_WYyfFW8bJ_-RkrudJIlDdHh9fc6_aHkuwzW9gylY-k,13922
-angr/analyses/decompiler/callsite_maker.py,sha256=M-1WkgKk7VfMhiU0aZCkhIsEPE51tXCgVNxj1Ped6Ns,17903
+angr/analyses/decompiler/callsite_maker.py,sha256=ulPOsw1oVSUXGzfR3NKn1CbmR7EcYNb0WAfm69Z8Rzg,18496
 angr/analyses/decompiler/clinic.py,sha256=lA0CGxxZPc0WfRaMLkZ7zwhzG8plC6yo6fA5Pq8_7Ak,103436
 angr/analyses/decompiler/condition_processor.py,sha256=pNr-BpmO_Rxma5ETbnlQnjwAWQuriiWXJEKGj5MyLQU,50875
 angr/analyses/decompiler/decompilation_cache.py,sha256=ynqveXnf_sULwFmQFr4rVDlRHoniICt8iyhC0Ds0mDU,1163
@@ -528,7 +528,7 @@ angr/knowledge_plugins/xrefs/__init__.py,sha256=5PhqVOtTZ27lCjJ9wp7akUeJydqILbyC
 angr/knowledge_plugins/xrefs/xref.py,sha256=ROo_kAEKwB51whVYcGtTV0QRtYmQZV8nEoEtbQWyC9U,4883
 angr/knowledge_plugins/xrefs/xref_manager.py,sha256=Yb88z3L8Y26TfGeRHdsGWQlT9f6oWntjEg6s-kcVtUQ,4040
 angr/knowledge_plugins/xrefs/xref_types.py,sha256=LcQ9pD4E4XlC51Us49xiqAoGAFGpnCrpYO4mOzILiKI,308
-angr/lib/angr_native.dll,sha256=n7eGPgnYcofuJxYmL1v92T2uQL7HuZVfglJnba779i0,19257344
+angr/lib/angr_native.dll,sha256=DETlZz3GV_3dvAvL3MBj5xb4HXcWYF4ai8uvjj117n0,19257344
 angr/misc/__init__.py,sha256=ZPHXbrIdsfe_qdmq8CnXuS_bBWOy4MDT2NjwUnPgHZc,355
 angr/misc/ansi.py,sha256=nPJHC0SKfqasMQZ0LxdmmIYojjmk4nr5jI6FrzoTwS0,811
 angr/misc/autoimport.py,sha256=iZagpuPwZWczUTYIqs-JkDMQjftMqc_cchcm7OBFiEg,3450
@@ -1334,9 +1334,9 @@ angr/utils/timing.py,sha256=ELuRPzdRSHzOATgtAzTFByMlVr021ypMrsvtpopreLg,1481
 angr/utils/ssa/__init__.py,sha256=Z7yXY0xe4X-T4bfdK0YtL9ZFnYF-JhQuJ16ZW-wpSZI,7886
 angr/utils/ssa/tmp_uses_collector.py,sha256=rSpvMxBHzg-tmvhsfjn3iLyPEKzaZN-xpQrdslMq3J4,793
 angr/utils/ssa/vvar_uses_collector.py,sha256=8gfAWdRMz73Deh-ZshDM3GPAot9Lf-rHzCiaCil0hlE,1342
-angr-9.2.121.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
-angr-9.2.121.dist-info/METADATA,sha256=DdEMx5H0Oc4PIKcgRNN6CZoviZOpeq6y-krrFm1qgH4,4830
-angr-9.2.121.dist-info/WHEEL,sha256=37evyuMEjsyAveQX40iT43Lz7iWGYiYX5J9a6lEUCNg,97
-angr-9.2.121.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
-angr-9.2.121.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
-angr-9.2.121.dist-info/RECORD,,
+angr-9.2.122.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
+angr-9.2.122.dist-info/METADATA,sha256=DWONvK3kM7LVW6pLjbuyxr2eB1P6ZlNdgAEm4afhXK4,4830
+angr-9.2.122.dist-info/WHEEL,sha256=37evyuMEjsyAveQX40iT43Lz7iWGYiYX5J9a6lEUCNg,97
+angr-9.2.122.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
+angr-9.2.122.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
+angr-9.2.122.dist-info/RECORD,,