angr 9.2.107__py3-none-macosx_10_9_x86_64.whl → 9.2.109__py3-none-macosx_10_9_x86_64.whl

angr/__init__.py

@@ -1,7 +1,7 @@
 # pylint: disable=wildcard-import
 # pylint: disable=wrong-import-position
 
-__version__ = "9.2.107"
+__version__ = "9.2.109"
 
 if bytes is str:
     raise Exception(
@@ -36,12 +36,6 @@ loggers = Loggers()
 del Loggers
 del logging
 
-# import hook: pkg_resources is too slow to import, but it is used by some other packages that angr depends on. while
-# we upstream our fixes, we replace it with a light-weight solution.
-from .misc.import_hooks import import_fake_pkg_resources
-
-import_fake_pkg_resources(force=False)
-
 # this must happen first, prior to initializing analyses
 from .sim_procedure import SimProcedure
 from .procedures import SIM_PROCEDURES, SimProcedures, SIM_LIBRARIES, SIM_TYPE_COLLECTIONS

angr/analyses/reassembler.py

@@ -2181,7 +2181,7 @@ class Reassembler(Analysis):
                 )
             all_assembly_lines.append(data.assembly(comments=comments, symbolized=symbolized))
 
-        s = "\n".join(all_assembly_lines)
+        s += "\n".join(all_assembly_lines)
 
         return s
 

angr/engines/vex/heavy/heavy.py

@@ -121,6 +121,18 @@ class HeavyVEXMixin(SuccessorsMixin, ClaripyDataMixin, SimStateStorageMixin, VEX
         self.state.scratch.bbl_addr = addr
 
         while True:
+            # check permissions, are we allowed to execute here? Do we care?
+            if o.STRICT_PAGE_ACCESS in self.state.options:
+                try:
+                    perms = self.state.memory.permissions(addr)
+                except errors.SimMemoryError as sim_mem_err:
+                    raise errors.SimSegfaultError(addr, "exec-miss") from sim_mem_err
+                else:
+                    if not self.state.solver.symbolic(perms):
+                        perms = self.state.solver.eval(perms)
+                        if not perms & 4 and o.ENABLE_NX in self.state.options:
+                            raise errors.SimSegfaultError(addr, "non-executable")
+
             if irsb is None:
                 irsb = self.lift_vex(
                     addr=addr,
@@ -148,18 +160,6 @@ class HeavyVEXMixin(SuccessorsMixin, ClaripyDataMixin, SimStateStorageMixin, VEX
             if irsb.size == 0:
                 raise errors.SimIRSBError("Empty IRSB passed to HeavyVEXMixin.")
 
-            # check permissions, are we allowed to execute here? Do we care?
-            if o.STRICT_PAGE_ACCESS in self.state.options:
-                try:
-                    perms = self.state.memory.permissions(addr)
-                except errors.SimMemoryError as sim_mem_err:
-                    raise errors.SimSegfaultError(addr, "exec-miss") from sim_mem_err
-                else:
-                    if not self.state.solver.symbolic(perms):
-                        perms = self.state.solver.eval(perms)
-                        if not perms & 4 and o.ENABLE_NX in self.state.options:
-                            raise errors.SimSegfaultError(addr, "non-executable")
-
             self.state.scratch.set_tyenv(irsb.tyenv)
             self.state.scratch.irsb = irsb
 

angr/misc/bug_report.py

@@ -1,11 +1,10 @@
-import importlib
+import importlib.metadata
 import os
 import sys
 import datetime
 import gc
 import ctypes
-
-from .import_hooks import remove_fake_pkg_resources
+import sysconfig
 
 
 have_gitpython = False
@@ -34,10 +33,6 @@ def get_venv():
 
 
 def print_versions():
-    remove_fake_pkg_resources()
-    # import the real pkg_resources
-    import pkg_resources  # pylint:disable=import-outside-toplevel
-
     for m in angr_modules:
         print("######## %s #########" % m)
         try:
@@ -50,7 +45,7 @@ def print_versions():
         print("Python found it in %s" % (python_filename))
         try:
             pip_package = python_packages.get(m, m)
-            pip_version = pkg_resources.get_distribution(pip_package)
+            pip_version = importlib.metadata.version(pip_package)
             print("Pip version %s" % pip_version)
         except Exception:  # pylint: disable-broad-except
             print("Pip version not found!")
@@ -83,11 +78,7 @@ def print_git_info(dirname):
 
 
 def print_system_info():
-    remove_fake_pkg_resources()
-    # import the real pkg_resources
-    import pkg_resources  # pylint:disable=import-outside-toplevel
-
-    print("Platform: " + pkg_resources.get_build_platform())
+    print("Platform: " + sysconfig.get_platform())
     print("Python version: " + str(sys.version))
 
 

angr/state_plugins/unicorn_engine.py

@@ -1,9 +1,9 @@
 import binascii
 import copy
 import ctypes
+import importlib.resources
 import itertools
 import logging
-import os
 import sys
 import threading
 import time
@@ -392,23 +392,6 @@ class _VexArchInfo(ctypes.Structure):
     ]
 
 
-def _locate_lib(module: str, library: str) -> str:
-    """
-    Attempt to find a native library without using pkg_resources, and only fall back to pkg_resources upon failures.
-    This is because "import pkg_resources" is slow.
-
-    :return:    The full path of the native library.
-    """
-    base_dir = os.path.join(os.path.dirname(__file__), "..")
-    attempt = os.path.join(base_dir, library)
-    if os.path.isfile(attempt):
-        return attempt
-
-    import pkg_resources  # pylint:disable=import-outside-toplevel
-
-    return pkg_resources.resource_filename(module, os.path.join(library))
-
-
 def _load_native():
     if sys.platform == "darwin":
         libfile = "angr_native.dylib"
@@ -418,7 +401,7 @@ def _load_native():
         libfile = "angr_native.so"
 
     try:
-        angr_path = _locate_lib("angr", os.path.join("lib", libfile))
+        angr_path = str(importlib.resources.files("angr") / "lib" / libfile)
         h = ctypes.CDLL(angr_path)
 
         VexArch = ctypes.c_int

angr/storage/memory_mixins/paged_memory/pages/list_page.py

@@ -134,7 +134,7 @@ class ListPage(MemoryObjectMixin, PageBase):
         merged_offsets = set()
         for b in sorted(changed_offsets):
             if merged_to is not None and not b >= merged_to:
-                l.info("merged_to = %d ... already merged byte 0x%x", merged_to, b)
+                l.debug("merged_to = %d ... already merged byte 0x%x", merged_to, b)
                 continue
             l.debug("... on byte 0x%x", b)
 
@@ -145,10 +145,10 @@ class ListPage(MemoryObjectMixin, PageBase):
             # all memories that don't have those bytes
             for sm, fv in zip(all_pages, merge_conditions):
                 if sm._contains(b, page_addr):
-                    l.info("... present in %s", fv)
+                    l.debug("... present in %s", fv)
                     memory_objects.append((sm.content[b], fv))
                 else:
-                    l.info("... not present in %s", fv)
+                    l.debug("... not present in %s", fv)
                     unconstrained_in.append((sm, fv))
 
             mos = {mo for mo, _ in memory_objects}
@@ -207,7 +207,7 @@ class ListPage(MemoryObjectMixin, PageBase):
                             min_size = i
                             break
                 merged_to = b + min_size
-                l.info("... determined minimum size of %d", min_size)
+                l.debug("... determined minimum size of %d", min_size)
 
                 # Now, we have the minimum size. We'll extract/create expressions of that
                 # size and merge them

{angr-9.2.107.dist-info → angr-9.2.109.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.107
+Version: 9.2.109
 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.107
-Requires-Dist: archinfo ==9.2.107
+Requires-Dist: ailment ==9.2.109
+Requires-Dist: archinfo ==9.2.109
 Requires-Dist: cachetools
 Requires-Dist: capstone ==5.0.0.post1
 Requires-Dist: cffi >=1.14.0
-Requires-Dist: claripy ==9.2.107
-Requires-Dist: cle ==9.2.107
+Requires-Dist: claripy ==9.2.109
+Requires-Dist: cle ==9.2.109
 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.107
+Requires-Dist: pyvex ==9.2.109
 Requires-Dist: rich >=13.1.0
 Requires-Dist: rpyc
 Requires-Dist: sortedcontainers

{angr-9.2.107.dist-info → angr-9.2.109.dist-info}/RECORD

@@ -1,4 +1,4 @@
-angr/__init__.py,sha256=R0l86rWUgejEZSvJjbSX_yUG3S1XbpboqEWc5DN0fcg,3993
+angr/__init__.py,sha256=ZbR88OEoedUzwQt3SxuXOskW0xn2fDW6Aa9sxhOSUAc,3708
 angr/__main__.py,sha256=kaO56Te6h73SM94BVtASF00q5QbBbC3eBs9poVc9sVI,1887
 angr/annocfg.py,sha256=1tnBfxgLJh9I6Brm1JDdsWLHGmCQYdD6PTC_bFTOMrg,10775
 angr/blade.py,sha256=B8QXVQ93jz1YCIlb-dZLeBqYmVFdMXI5GleP1Wnxjrw,15519
@@ -50,7 +50,7 @@ angr/analyses/init_finder.py,sha256=hFHPsHipF4QkWzVqcDeTgL6YIaYi8bAyaURZBksS4KI,
 angr/analyses/loop_analysis.py,sha256=nIbDIzvys-FRtJYnoZYNbMWH5V88qrhoMtrMRCTbkLY,9412
 angr/analyses/loopfinder.py,sha256=X8F4Dcu2UHDXt6JifK6EfROAeeczyca6V7zxx9z7GpQ,7122
 angr/analyses/proximity_graph.py,sha256=TEgEYMnZgjV9oWUS3mIteftrGeFJCqMkeDUHy38NBq8,16260
-angr/analyses/reassembler.py,sha256=TCMyiW1IrKIuNaZCVRARwHpN39GHYDKaH5O3FsSmKlE,100412
+angr/analyses/reassembler.py,sha256=U1suz3TwZI2jopzPXNenxa1uFD2aB3JVS-M8yIWX-lc,100413
 angr/analyses/soot_class_hierarchy.py,sha256=Cs_LRV1RLXH6sF_E49tJWg9Inxvv_o5mB-VaIBcbQJg,8941
 angr/analyses/stack_pointer_tracker.py,sha256=9TOGwz5Rx4jXxoGbdtrBrMca6mJi3SXn4MS4Gx-vrmk,30207
 angr/analyses/static_hooker.py,sha256=g57k_fwxgS4oTzslyCpOf4faG17E685a4-4SpEz8Ges,1711
@@ -399,7 +399,7 @@ angr/engines/vex/heavy/__init__.py,sha256=VapnI5PnxNnZyqtmQpJNrRs9Yh01-gpfR1LjaG
 angr/engines/vex/heavy/actions.py,sha256=f8CbzwIOSgksmiY5nwDlgAomOI88wa5S_4vk5RE5718,8871
 angr/engines/vex/heavy/concretizers.py,sha256=bwv8VIqwS2DGP3qf_EI4Kb97_Ma8wygbnn-0HWsTfo0,14702
 angr/engines/vex/heavy/dirty.py,sha256=a4rWD03dA9m7HoLM8-TBMxFptkyRNVPWg8OOAiar-Cg,18699
-angr/engines/vex/heavy/heavy.py,sha256=ZDRxpH1V3396MuyofLFbyy_cgAoljkWXEBR5Mr_nYRE,15822
+angr/engines/vex/heavy/heavy.py,sha256=mr_k23ykI8NV3SwqeNzKTDtJr_9n6nIIFNMII5ThbOU,15822
 angr/engines/vex/heavy/inspect.py,sha256=NNQpo4E267W8Z0RDQee9gGH9KDx0mydwjVo02yogT6o,2317
 angr/engines/vex/heavy/resilience.py,sha256=4TYoIFjIygSwRsu4229CsbRNOtlP-QQuligWZRKlEjQ,3737
 angr/engines/vex/heavy/super_fastpath.py,sha256=2E1Tdai9Xf7g-wf5AD3FrLN67pVusnQtF1aPRLLNxEg,1180
@@ -489,13 +489,12 @@ angr/knowledge_plugins/xrefs/__init__.py,sha256=-5A2h048WTRu6Et7q7bqlc-AyBXNuJ9A
 angr/knowledge_plugins/xrefs/xref.py,sha256=1BMphrr8iViDtVWPXWidmY1_uNmw9LRvEwwZLt3Zqw8,4907
 angr/knowledge_plugins/xrefs/xref_manager.py,sha256=a4uvTJkdM0PQIuyYcd7t76IddrrVjPGe9SZrRaqp2II,3980
 angr/knowledge_plugins/xrefs/xref_types.py,sha256=VR3xLQQ-gUg25oX0OL3BJHyQRlZh2A8syBac9ZMS9n4,271
-angr/lib/angr_native.dylib,sha256=8wBVp7m6U2Ho3HU0btq1nqAjREbNStYzZSIq1PMwP-o,18604080
+angr/lib/angr_native.dylib,sha256=FFEXAeGI69CZOMyittYckarB76zJPiQqku4Hai1st3I,18604080
 angr/misc/__init__.py,sha256=Ct-Q6-c-Frdz5Ihkqmou3j_1jyJi8WJXlQxs-gPQg0Y,237
 angr/misc/ansi.py,sha256=m5RY65yyvluUJErkvCF4I4z1o5kXi2xb3Yuvt9bITCA,776
 angr/misc/autoimport.py,sha256=vSXclz6pss3lMecoT5_doX0SvORNmZPIvVyDm4je4HE,3419
-angr/misc/bug_report.py,sha256=JJ0IkN9-VAjqJjdfNaSNlV5GqRyu-B9gus3WA1WnLbQ,4241
+angr/misc/bug_report.py,sha256=83AsIgUVhE1rZO0mQPO6h5VDYRyBq1Wv1CjQAxJ04ME,3928
 angr/misc/hookset.py,sha256=TzhmQYf7BP6fHKXYu_1tHalrHAmP4IVmVkh_Hlp8fS8,4486
-angr/misc/import_hooks.py,sha256=SpcB3ML_1HTO3JeGVsAD6GFEpxy2C4EMpLzH9zSq8Xo,1943
 angr/misc/loggers.py,sha256=m3BZ0WFL14qmYZiGgGKKJ31tLnO5x2BV4UmqD2606wc,4225
 angr/misc/picklable_lock.py,sha256=IZ9sk7MTvDXtX7EDWEBRwGEn_DNqfsTlzFcMCodnjUk,1276
 angr/misc/plugins.py,sha256=W5P5wwxo42ThYXOl9yTlbO-qYr-WrxIf8i7jy-ohra4,9339
@@ -1211,7 +1210,7 @@ angr/state_plugins/solver.py,sha256=HrEQgqNJtzdB8I8Qu8XG_3LjMBt6OdbAIewUFZiNZHk,
 angr/state_plugins/symbolizer.py,sha256=3UAfStON-0GuuHhkD4JD6Y5WveqEfTD3JLK3uj0R-co,11039
 angr/state_plugins/trace_additions.py,sha256=LRcgdGKY2QtzOwsVa-FYLGRFcl0ISOnq-WzCMayiM-8,30091
 angr/state_plugins/uc_manager.py,sha256=9yEE10rrGXTVncLzVOpgvSAGA2RdzApUu_fq_lUksDs,2643
-angr/state_plugins/unicorn_engine.py,sha256=till_XsE5yEL9BbdVnxi0PK_kJ6sAF0oYwh1d0zC138,78095
+angr/state_plugins/unicorn_engine.py,sha256=EHaP64FofZe3Kl_tdeDRzQWfoTp7j8_K1b3exkLZmLU,77522
 angr/state_plugins/view.py,sha256=4gUiyQM2IPZ2rn91yNKN9CQp662XzdigSeGdVQ5lOFM,12361
 angr/state_plugins/heap/__init__.py,sha256=uyxW6BfOmiuhbIYIjXMDQW8AxfN9scC2bwRdsSAiajk,136
 angr/state_plugins/heap/heap_base.py,sha256=qtonZCTiGSh30UbPZ92ILXRVmO3pV4NZyDPN0DB8QvI,6229
@@ -1261,7 +1260,7 @@ angr/storage/memory_mixins/paged_memory/pages/__init__.py,sha256=rwGAcESljLORCDt
 angr/storage/memory_mixins/paged_memory/pages/cooperation.py,sha256=3FTR6Ksqn8Vg3QvvyMNs_6EvwgFVi_xvYxId7hR_ZZw,12726
 angr/storage/memory_mixins/paged_memory/pages/history_tracking_mixin.py,sha256=P5ORlm26_7v--hNcxDwLzZGTRwcLcaHzKModa5yoUPA,3003
 angr/storage/memory_mixins/paged_memory/pages/ispo_mixin.py,sha256=mHt5nQYXkXifwGT0_UGvKirECEC2v7jNNtf_6oY57uI,2050
-angr/storage/memory_mixins/paged_memory/pages/list_page.py,sha256=LCTURmDCtAtBrvaCjwaMSXgT-gfAhP22t8TEx2L0L7E,14580
+angr/storage/memory_mixins/paged_memory/pages/list_page.py,sha256=FJhqPdF0fFkktIfUKaVZoDxD5jW7qwugn6US2yctcrc,14584
 angr/storage/memory_mixins/paged_memory/pages/multi_values.py,sha256=hW-8svWpMJj4q6GVnW5JqDAp-2riFS5PnE7B_FXEIEw,11289
 angr/storage/memory_mixins/paged_memory/pages/mv_list_page.py,sha256=7pAL_YxTNEx1d7qTpJqrXIRKMB04SN4ASwz6vfyBbCk,17671
 angr/storage/memory_mixins/paged_memory/pages/permissions_mixin.py,sha256=Ek2YSmFOGUScFXPx8hqroNkl3gK1aqKCMv_X3_pImLs,830
@@ -1293,9 +1292,9 @@ angr/utils/mp.py,sha256=cv_NeysxLgyCdE-Euefnfv078ia5maHSnUn9f23zz88,1882
 angr/utils/segment_list.py,sha256=5nnuVtdZk9NS2y_xUBVA9khWPueP_zagNtPSjaoMHbA,20410
 angr/utils/timing.py,sha256=uOowCP8kotDrKDOjlAod-guBuYkAA8zEtiAwpdwMlIU,1334
 angr/utils/typing.py,sha256=pCjA7JZAzcvrk-iyIE2cRHc1G66AMSGEON3aFfjtPVc,431
-angr-9.2.107.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
-angr-9.2.107.dist-info/METADATA,sha256=_gEn1iA1KJfNDSl9GKjBrAhN7mSwB_qABsgvByfyh5E,4703
-angr-9.2.107.dist-info/WHEEL,sha256=YBuZgLbEquNCbbbQPlLFm_OOe1fPwf91V3LBhwgnks4,107
-angr-9.2.107.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
-angr-9.2.107.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
-angr-9.2.107.dist-info/RECORD,,
+angr-9.2.109.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
+angr-9.2.109.dist-info/METADATA,sha256=tm5sgCXFDNMimLnCiwcDzMSK1ODRSZesL4g3sBNRO1g,4703
+angr-9.2.109.dist-info/WHEEL,sha256=kE-k43Rbyi5otlkw63OSoEqofPlZ9xRRlonvc44OAzg,106
+angr-9.2.109.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
+angr-9.2.109.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
+angr-9.2.109.dist-info/RECORD,,

{angr-9.2.107.dist-info → angr-9.2.109.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-macosx_10_9_x86_64
 

angr/misc/import_hooks.py

@@ -1,63 +0,0 @@
-# pylint:disable=import-outside-toplevel
-import os.path
-import sys
-import importlib.util
-from importlib.machinery import ModuleSpec
-
-
-class FastPkgResources:
-    """
-    A class that replaces pkg_resources. It only implements resource_filename() and forwards all unimplemented
-    attributes to the original pkg_resources.
-    """
-
-    def __getattribute__(self, name):
-        try:
-            return object.__getattribute__(self, name)
-        except AttributeError:
-            # fallback to the real pkg_resources
-            remove_fake_pkg_resources()
-            import pkg_resources
-
-            return getattr(pkg_resources, name)
-
-    @staticmethod
-    def __spec__():
-        return ModuleSpec("pkg_resources", None)
-
-    def resource_filename(self, package, resource_name):
-        r = self._resource_filename(package, resource_name)
-        if r is None:
-            # fallback to the real pkg_resources
-            remove_fake_pkg_resources()
-            import pkg_resources
-
-            return pkg_resources.resource_filename(package, resource_name)
-        return r
-
-    @staticmethod
-    def _resource_filename(package, resource_name):
-        spec = importlib.util.find_spec(package)
-        if spec is None:
-            return None
-        if not spec.origin:
-            return None
-        if os.path.isfile(spec.origin):
-            # get the directory
-            base_dir = os.path.dirname(spec.origin)
-        else:
-            base_dir = spec.origin
-        resource_path = os.path.join(base_dir, resource_name)
-        if os.path.exists(resource_path):
-            return resource_path
-        return None
-
-
-def import_fake_pkg_resources(force=False):
-    if force or "pkg_resources" not in sys.modules:
-        sys.modules["pkg_resources"] = FastPkgResources()
-
-
-def remove_fake_pkg_resources():
-    if isinstance(sys.modules.get("pkg_resources", None), FastPkgResources):
-        sys.modules.pop("pkg_resources")