angr 9.2.135__py3-none-macosx_11_0_arm64.whl → 9.2.137__py3-none-macosx_11_0_arm64.whl

angr/knowledge_plugins/functions/function_manager.py

@@ -6,6 +6,7 @@ from collections.abc import Generator
 import logging
 import collections.abc
 import re
+import weakref
 from sortedcontainers import SortedDict
 
 import networkx
@@ -31,7 +32,7 @@ class FunctionDict(SortedDict):
     """
 
     def __init__(self, backref, *args, **kwargs):
-        self._backref = backref
+        self._backref = weakref.proxy(backref) if backref is not None else None
         self._key_types = kwargs.pop("key_types", int)
         super().__init__(*args, **kwargs)
 
@@ -39,7 +40,7 @@ class FunctionDict(SortedDict):
         try:
             return super().__getitem__(addr)
         except KeyError as ex:
-            if not isinstance(addr, self._key_types):
+            if isinstance(addr, bool) or not isinstance(addr, self._key_types):
                 raise TypeError(f"FunctionDict only supports {self._key_types} as key type") from ex
 
             if isinstance(addr, SootMethodDescriptor):
@@ -148,7 +149,7 @@ class FunctionManager(KnowledgeBasePlugin, collections.abc.Mapping):
         dst_func = self._function_map[function_addr]
         if syscall in (True, False):
             dst_func.is_syscall = syscall
-        dst_func._register_nodes(True, node)
+        dst_func._register_node(True, node)
         self.block_map[node.addr] = node
 
     def _add_call_to(
@@ -160,7 +161,7 @@ class FunctionManager(KnowledgeBasePlugin, collections.abc.Mapping):
         syscall=None,
         stmt_idx=None,
         ins_addr=None,
-        return_to_outside=False,
+        return_to_outside: bool = False,
     ):
         """
         Add a call to a function.
@@ -172,7 +173,7 @@ class FunctionManager(KnowledgeBasePlugin, collections.abc.Mapping):
         :param bool syscall:        If this is a call to a syscall or not.
         :param int stmt_idx:        ID of the statement where this call happens.
         :param int ins_addr:        Address of the instruction where this call happens.
-        :param bool return_to_outside:  True if the return of the call is considered going to outside of the current
+        :param return_to_outside:  True if the return of the call is considered going to outside of the current
                                         function.
         :return:                    None
         """
@@ -306,7 +307,7 @@ class FunctionManager(KnowledgeBasePlugin, collections.abc.Mapping):
         try:
             _ = self[item]
             return True
-        except KeyError:
+        except (KeyError, TypeError):
             return False
 
     def __getitem__(self, k) -> Function:
@@ -406,7 +407,7 @@ class FunctionManager(KnowledgeBasePlugin, collections.abc.Mapping):
 
         try:
             prev_addr = self._function_map.floor_addr(addr)
-            return self._function_map[prev_addr]
+            return self._function_map.get(prev_addr)
 
         except KeyError:
             return None

angr/knowledge_plugins/functions/function_parser.py

@@ -246,7 +246,7 @@ class FunctionParser:
         # add leftover blocks
         for block in blocks.values():
             if block not in added_nodes:
-                obj._register_nodes(True, block)
+                obj._register_node(True, block)
 
         return obj
 

angr/knowledge_plugins/functions/soot_function.py

@@ -1,7 +1,11 @@
+# pylint:disable=super-init-not-called
 from __future__ import annotations
 import os
-import networkx
 from collections import defaultdict
+
+import networkx
+
+from angr.codenode import BlockNode
 from .function import Function
 
 
@@ -88,10 +92,6 @@ class SootFunction(Function):
         if hooker and hasattr(hooker, "NO_RET"):
             self.returning = not hooker.NO_RET
 
-        self.prepared_registers = set()
-        self.prepared_stack_variables = set()
-        self.registers_read_afterwards = set()
-
         # startpoint can always be None if this CFGNode is a syscall node
         self.startpoint = None
 
@@ -108,24 +108,21 @@ class SootFunction(Function):
         # The Shimple CFG is already normalized.
         pass
 
-    def _register_nodes(self, is_local, *nodes):
-        if not isinstance(is_local, bool):
-            raise AngrValueError('_register_nodes(): the "is_local" parameter must be a bool')
+    def _register_node(self, is_local: bool, node):
+        if is_local and self._local_blocks.get(node.addr) == node:
+            return self._local_blocks[node.addr]
 
-        for node in nodes:
+        if node not in self.transition_graph:
             self.transition_graph.add_node(node)
-            node._graph = self.transition_graph
-            if node.addr not in self or self._block_sizes[node.addr] == 0:
-                self._block_sizes[node.addr] = node.size
-            if node.addr == self.addr.addr and (self.startpoint is None or not self.startpoint.is_hook):
-                self.startpoint = node
-            if is_local:
-                self._local_blocks[node.addr] = node
-                self._local_block_addrs.add(node.addr)
-            # add BlockNodes to the addr_to_block_node cache if not already there
-            if isinstance(node, BlockNode) and node.addr not in self._addr_to_block_node:
-                self._addr_to_block_node[node.addr] = node
-
-
-from angr.codenode import BlockNode
-from angr.errors import AngrValueError
+        node._graph = self.transition_graph
+        if node.addr not in self or self._block_sizes[node.addr] == 0:
+            self._block_sizes[node.addr] = node.size
+        if node.addr == self.addr.addr and (self.startpoint is None or not self.startpoint.is_hook):
+            self.startpoint = node
+        if is_local:
+            self._local_blocks[node.addr] = node
+            self._local_block_addrs.add(node.addr)
+        # add BlockNodes to the addr_to_block_node cache if not already there
+        if isinstance(node, BlockNode) and node.addr not in self._addr_to_block_node:
+            self._addr_to_block_node[node.addr] = node
+        return node

angr/knowledge_plugins/propagations/propagation_model.py

@@ -6,7 +6,7 @@ import claripy
 import ailment
 from angr.serializable import Serializable
 from angr.knowledge_plugins.functions.function import Function
-from .states import PropagatorVEXState, PropagatorAILState, PropagatorState
+from .states import PropagatorVEXState, PropagatorState
 
 
 class PropagationModel(Serializable):
@@ -65,10 +65,9 @@ class PropagationModel(Serializable):
         preds = [self.states[pnode.addr] for pnode in self._function.graph.predecessors(node)]
         if not preds:
             if isinstance(node, ailment.Block):
-                state = PropagatorAILState.initial_state(self._function.project, func_addr=self._function.addr)
-            else:
-                state = PropagatorVEXState.initial_state(self._function.project, func_addr=self._function.addr)
-                state.store_register(state.arch.ip_offset, state.arch.bytes, claripy.BVV(block_addr, state.arch.bits))
+                raise NotImplementedError
+            state = PropagatorVEXState.initial_state(self._function.project, func_addr=self._function.addr)
+            state.store_register(state.arch.ip_offset, state.arch.bytes, claripy.BVV(block_addr, state.arch.bits))
         else:
             state, _ = preds[0].merge(*preds[1:])
         return state