angr 9.2.57__py3-none-macosx_10_9_x86_64.whl → 9.2.59__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.57"
+__version__ = "9.2.59"
 
 if bytes is str:
     raise Exception(

angr/analyses/cfg/cfg_base.py

@@ -674,7 +674,9 @@ class CFGBase(Analysis):
             all_bytes = self._fast_memory_load_bytes(start, size)
 
         if all_bytes is None:
-            return True
+            # failed to load bytes in this region. it might be because the region is not fully mapped (i.e., there are
+            # holes). we assume this region is good for analysis.
+            return False
 
         if len(all_bytes) < size:
             l.warning(

angr/analyses/decompiler/optimization_passes/flip_boolean_cmp.py

@@ -4,7 +4,7 @@ import ailment
 from ailment.expression import Op
 
 from ..structuring.structurer_nodes import ConditionNode
-from ..structured_codegen.c import is_simple_return_node
+from ..utils import structured_node_is_simple_return
 from .optimization_pass import SequenceOptimizationPass, OptimizationPassStage
 
 
@@ -33,6 +33,6 @@ class FlipBooleanCmp(SequenceOptimizationPass):
     def _analyze(self, cache=None):
         condition_nodes: List[ConditionNode] = cache or []
         for node in condition_nodes:
-            if isinstance(node.condition, Op) and is_simple_return_node(node.false_node, self._graph):
+            if isinstance(node.condition, Op) and structured_node_is_simple_return(node.false_node, self._graph):
                 node.condition = ailment.expression.negate(node.condition)
                 node.true_node, node.false_node = node.false_node, node.true_node

angr/analyses/decompiler/structured_codegen/c.py

@@ -30,6 +30,7 @@ from ....sim_variable import SimVariable, SimTemporaryVariable, SimStackVariable
 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 ....knowledge_plugins.cfg.memory_data import MemoryData, MemoryDataSort
 from ... import Analysis, register_analysis
@@ -173,35 +174,6 @@ def guess_value_type(value: int, project: "angr.Project") -> Optional[SimType]:
     return None
 
 
-def is_simple_return_node(node: Union[Block, SequenceNode], graph) -> bool:
-    """
-    Will check if a "simple return" is contained within the node a simple returns looks like this:
-    if (cond) {
-      // simple return
-      ...
-      return 0;
-    }
-    ...
-
-    Any block can end in a return as long as it does not have condition inside.
-    """
-    # sanity check: we need a graph to understand returning blocks
-    if graph is None:
-        return False
-
-    last_block = None
-    if isinstance(node, SequenceNode) and node.nodes:
-        for n in node.nodes:
-            if not isinstance(n, Block):
-                break
-        else:
-            last_block = n
-    elif isinstance(node, Block):
-        last_block = node
-
-    return last_block and last_block in graph and not list(graph.successors(last_block))
-
-
 #
 #   C Representation Classes
 #
@@ -2814,7 +2786,7 @@ class CStructuredCodeGenerator(BaseStructuredCodeGenerator, Analysis):
             condition_and_nodes,
             else_node=else_node,
             simplify_else_scope=self.simplify_else_scope
-            and is_simple_return_node(condition_node.true_node, self.ail_graph),
+            and structured_node_is_simple_return(condition_node.true_node, self.ail_graph),
             tags=tags,
             codegen=self,
         )

angr/analyses/decompiler/utils.py

@@ -1,5 +1,5 @@
 # pylint:disable=wrong-import-position
-from typing import Optional, Tuple, Any, Union
+from typing import Optional, Tuple, Any, Union, List
 
 import networkx
 
@@ -358,6 +358,48 @@ def remove_labels(graph: networkx.DiGraph):
     return new_graph
 
 
+def structured_node_is_simple_return(node: Union["SequenceNode", "MultiNode"], graph: networkx.DiGraph) -> bool:
+    """
+    Will check if a "simple return" is contained within the node a simple returns looks like this:
+    if (cond) {
+      // simple return
+      ...
+      return 0;
+    }
+    ...
+
+    Returns tue on any block ending in linear statements and a return.
+    """
+
+    def _flatten_structured_node(packed_node: Union["SequenceNode", "MultiNode"]) -> List[ailment.Block]:
+        if not packed_node or not packed_node.nodes:
+            return []
+
+        blocks = []
+        if packed_node.nodes is not None:
+            for _node in packed_node.nodes:
+                if isinstance(_node, (SequenceNode, MultiNode)):
+                    blocks += _flatten_structured_node(_node)
+                else:
+                    blocks.append(_node)
+
+        return blocks
+
+    # sanity check: we need a graph to understand returning blocks
+    if graph is None:
+        return False
+
+    last_block = None
+    if isinstance(node, (SequenceNode, MultiNode)) and node.nodes:
+        flat_blocks = _flatten_structured_node(node)
+        if all(isinstance(block, ailment.Block) for block in flat_blocks):
+            last_block = flat_blocks[-1]
+    elif isinstance(node, ailment.Block):
+        last_block = node
+
+    return last_block and last_block in graph and not list(graph.successors(last_block))
+
+
 # delayed import
 from .structuring.structurer_nodes import (
     MultiNode,

{angr-9.2.57.dist-info → angr-9.2.59.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.57
+Version: 9.2.59
 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
@@ -16,13 +16,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: CppHeaderParser
 Requires-Dist: GitPython
-Requires-Dist: ailment (==9.2.57)
-Requires-Dist: archinfo (==9.2.57)
+Requires-Dist: ailment (==9.2.59)
+Requires-Dist: archinfo (==9.2.59)
 Requires-Dist: cachetools
 Requires-Dist: capstone (!=5.0.0rc2,>=3.0.5rc2)
 Requires-Dist: cffi (>=1.14.0)
-Requires-Dist: claripy (==9.2.57)
-Requires-Dist: cle (==9.2.57)
+Requires-Dist: claripy (==9.2.59)
+Requires-Dist: cle (==9.2.59)
 Requires-Dist: dpkt
 Requires-Dist: itanium-demangler
 Requires-Dist: mulpyplexer
@@ -31,7 +31,7 @@ Requires-Dist: networkx (!=2.8.1,>=2.0)
 Requires-Dist: protobuf (>=3.19.0)
 Requires-Dist: psutil
 Requires-Dist: pycparser (>=2.18)
-Requires-Dist: pyvex (==9.2.57)
+Requires-Dist: pyvex (==9.2.59)
 Requires-Dist: rich (>=13.1.0)
 Requires-Dist: rpyc
 Requires-Dist: sortedcontainers

{angr-9.2.57.dist-info → angr-9.2.59.dist-info}/RECORD

@@ -1,4 +1,4 @@
-angr/__init__.py,sha256=59T1Js5whwPsIPsByrs5e6wUc25Y6ZZbG3TOZ7MbVl8,2800
+angr/__init__.py,sha256=9lA9M7oDfxcCqZvnXRDL4u7oSSvAqRHmhYoy_QM0taw,2800
 angr/annocfg.py,sha256=dK5JAdN4Ig_jgxTBZeZXwk3kAS4-IQUvE6T02GBZTDQ,10818
 angr/blade.py,sha256=1f5cqw1w6mKtYszN2-5QMxaoP_bbqpIaVlE7Vpf8yjc,15161
 angr/block.py,sha256=2XEvImDfD9NeQAKPGnulds4GKepThwwtnvV-22S3Gf0,14215
@@ -62,7 +62,7 @@ angr/analyses/cfg/__init__.py,sha256=DRCry4KO2k5VJLyfxD_O6dWAdi21IUoaN5TqCnukJJs
 angr/analyses/cfg/cfb.py,sha256=TqYdFau9ZH_m6cwkxbA35vDs2ES5rOFqfIuZi0lCBsQ,15450
 angr/analyses/cfg/cfg.py,sha256=1JpPGlqXXRFwE0tk26xjabT_-dq-kqAxMv7o6-DUhp4,3146
 angr/analyses/cfg/cfg_arch_options.py,sha256=YONHg6y-h6BCsBkJK9tuxb94DDfeOoy9CUS-LVyyDyg,3112
-angr/analyses/cfg/cfg_base.py,sha256=ouFA6Nq2bqsd09gX_gi5FKi-5y9mi0EixyDlRC44wdo,120467
+angr/analyses/cfg/cfg_base.py,sha256=jMe-bgFU7JaDRHsF4VTFO_PPnPV2B3PWKS6WwUtXkf4,120653
 angr/analyses/cfg/cfg_emulated.py,sha256=Fi3rDN5ByxhO-H4Y7qn-3WZgBG12JGyvxcWmrD_FnFQ,152842
 angr/analyses/cfg/cfg_fast.py,sha256=kToRVVWphkBO5IRLBAYNbUuJToUiEQ-pON8C80O5Hos,201393
 angr/analyses/cfg/cfg_fast_soot.py,sha256=eA_P-OY3gRRNj2BBgSPMsB_llGyFFCNW3VyGZ2uiMoM,26047
@@ -107,7 +107,7 @@ angr/analyses/decompiler/redundant_label_remover.py,sha256=kDGGFWWV61I5fbASiTQTH
 angr/analyses/decompiler/region_identifier.py,sha256=doxPwx7B4DCMtIDCf_wosGNMR9zj_SOME3lQ6AvXDF8,44212
 angr/analyses/decompiler/region_walker.py,sha256=lTfweYbY4_a2f2yGztTKG6JtU1jXf-kaz-NHbX9nkXE,717
 angr/analyses/decompiler/sequence_walker.py,sha256=Ak8jog1BRJIQZdOv7QRzcv-SgXR0Wfh0QicqgXuWUIM,7410
-angr/analyses/decompiler/utils.py,sha256=mOR2BphGYNoewtpL3eTpUaoXDaNRyYYrNT4jjg4qIB8,13427
+angr/analyses/decompiler/utils.py,sha256=8x-_FFK6TGv5Lj4_0u_y0J8U1i3cLBv74akOY69yzm4,14844
 angr/analyses/decompiler/ccall_rewriters/__init__.py,sha256=wbWqZ8xG6ZvzEApkAwMsNQFC-iwF3swG1YJsaf1cIrQ,102
 angr/analyses/decompiler/ccall_rewriters/amd64_ccalls.py,sha256=tgNvZ6I5wPWcrc7EDnGPzgkn2Q9p4n4AAAnZaEM_Igk,10571
 angr/analyses/decompiler/ccall_rewriters/rewriter_base.py,sha256=gWezEKB7A_YnlfUDs8V8D5syoYAyIXSIme1BKQRoouM,498
@@ -118,7 +118,7 @@ angr/analyses/decompiler/optimization_passes/div_simplifier.py,sha256=1yTI1mmFHB
 angr/analyses/decompiler/optimization_passes/eager_returns.py,sha256=ASLthbC5zHvwTXA2T4Fljyl487rSyO4gHpa34izDaw0,10116
 angr/analyses/decompiler/optimization_passes/engine_base.py,sha256=Q920CTvgxX4ueuRJVNvN30SYC-oH5_TreKVgQ2yJcq4,10392
 angr/analyses/decompiler/optimization_passes/expr_op_swapper.py,sha256=vlPhWDyvuEmbGcd1ka8rS68F72Ty6Hw3J00KM3tWCus,4701
-angr/analyses/decompiler/optimization_passes/flip_boolean_cmp.py,sha256=TTZxHUA4OnaBzHdtWwzYjULMz0iq8nskYQYP3dyUnfw,1578
+angr/analyses/decompiler/optimization_passes/flip_boolean_cmp.py,sha256=QozZWA5kOorUQVp0ohVrc00Myx95UGOstLNehhAn4EA,1585
 angr/analyses/decompiler/optimization_passes/ite_expr_converter.py,sha256=VBzHsSIImh0Q_7TUN4cV7n-4itrqn1Edn13WkgjAkGc,7610
 angr/analyses/decompiler/optimization_passes/lowered_switch_simplifier.py,sha256=mnGBJ8r10cHHB0g9TV-xQYd4xO_PBj66Rzz7VAfroZA,19038
 angr/analyses/decompiler/optimization_passes/mod_simplifier.py,sha256=A9pPly7otXJlLkSbItU0wvjGGu6rUsNpcFw3bzy4DjY,3046
@@ -181,7 +181,7 @@ angr/analyses/decompiler/region_simplifiers/switch_cluster_simplifier.py,sha256=
 angr/analyses/decompiler/region_simplifiers/switch_expr_simplifier.py,sha256=HGIiC6c3C91VfcqxUHe9aTsRohwmMXOHZH_G_dbwwx4,3327
 angr/analyses/decompiler/structured_codegen/__init__.py,sha256=Glc4jBCr7lZckltN9XZdSvMrGHf0swXFyKTr_QQKdWE,290
 angr/analyses/decompiler/structured_codegen/base.py,sha256=nJPOoeJCbewchYdXjSE4S2b1-WN6pT3TxmCQMDO0azw,3845
-angr/analyses/decompiler/structured_codegen/c.py,sha256=mOK6lQsVp4KB6i_6ibrjmk_21i-3AwSsVHWdShv8BTY,121356
+angr/analyses/decompiler/structured_codegen/c.py,sha256=LPjLr6sujZ5nEZDwm833PQ-fM6yQQ39ZOIK4WjwoedM,120597
 angr/analyses/decompiler/structured_codegen/dummy.py,sha256=IVfmtcWpTgNCRVsuW3GdQgDnuPmvodX85V0bBYtF_BI,535
 angr/analyses/decompiler/structured_codegen/dwarf_import.py,sha256=TMz65TkF_ID_Ipocj0aFDb84H6slolN90wq0tzhY2Rk,6773
 angr/analyses/decompiler/structuring/__init__.py,sha256=eSiT6xUpv9K5-enK3OZj2lNzxwowS9_5OTrjHiPgfFs,371
@@ -458,7 +458,7 @@ angr/knowledge_plugins/xrefs/__init__.py,sha256=-5A2h048WTRu6Et7q7bqlc-AyBXNuJ9A
 angr/knowledge_plugins/xrefs/xref.py,sha256=w4wjDFl4xtJYOtJplp9s1AIX3wI1RE71po3ufh1M4aY,4963
 angr/knowledge_plugins/xrefs/xref_manager.py,sha256=GYF9N1t4JxkDNGAwrVLo4_NF51P4gqiuQ21F0IbloF0,4026
 angr/knowledge_plugins/xrefs/xref_types.py,sha256=VR3xLQQ-gUg25oX0OL3BJHyQRlZh2A8syBac9ZMS9n4,271
-angr/lib/angr_native.dylib,sha256=DLk2Edtzmibpbh1Z-PP7HdEG1O1rJYgAStb3q-hFypA,18589728
+angr/lib/angr_native.dylib,sha256=klqBdCHYR3AvNGTmAL3MU2m2BIOATsM8Qn8Ubto6Gh0,18589728
 angr/misc/__init__.py,sha256=Ct-Q6-c-Frdz5Ihkqmou3j_1jyJi8WJXlQxs-gPQg0Y,237
 angr/misc/ansi.py,sha256=TKrx7d_MViChHh5RBR2VLufNrujTUioJWsZS5ugk8k4,807
 angr/misc/autoimport.py,sha256=6WT-Z6wf5NiacQhKZmR4d2bPOvNrokA7Wg0g2MUXSuw,2371
@@ -1181,8 +1181,8 @@ angr/utils/library.py,sha256=MYbY6rvC2Fi1ofbBHynh6-cdmaDETxj8hBz1gxKvsQQ,7178
 angr/utils/loader.py,sha256=QdkatPiyRfz5KdfCzRI1Xp3TJL_Pa75wY0dsILgMbwk,1944
 angr/utils/mp.py,sha256=xSWDnZdkLaTwGXntuSDwb2tIqMsIxJpmLrxd_YWBILw,1822
 angr/utils/timing.py,sha256=ddkLlRzlfmDlvRn9LseX9iQNQcNnQxzaJqnDSq7i1iU,1035
-angr-9.2.57.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
-angr-9.2.57.dist-info/METADATA,sha256=S08yKGvhVowaZ6_QueIg8f5ETONI_FySCgg58G-zKZE,4378
-angr-9.2.57.dist-info/WHEEL,sha256=cVdTqkH_C8vzq7Po70Hu1iJ439UCykNgBlhmX6fytPc,107
-angr-9.2.57.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
-angr-9.2.57.dist-info/RECORD,,
+angr-9.2.59.dist-info/LICENSE,sha256=cgL_ho5B1NH8UxwtBuqThRWdjear8b7hktycaS1sz6g,1327
+angr-9.2.59.dist-info/METADATA,sha256=aX1bV-XmjTR8CKw2SLZ9W_6co0tV9sBxJD194S3l9EU,4378
+angr-9.2.59.dist-info/WHEEL,sha256=cVdTqkH_C8vzq7Po70Hu1iJ439UCykNgBlhmX6fytPc,107
+angr-9.2.59.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
+angr-9.2.59.dist-info/RECORD,,