angr 9.2.116__py3-none-manylinux2014_aarch64.whl → 9.2.118__py3-none-manylinux2014_aarch64.whl

angr/state_plugins/debug_variables.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import TYPE_CHECKING
 import logging
 
@@ -28,19 +29,19 @@ class SimDebugVariable:
         self.type = var_type
 
     @staticmethod
-    def from_cle_variable(state: SimState, cle_variable: Variable, dwarf_cfa) -> "SimDebugVariable":
+    def from_cle_variable(state: SimState, cle_variable: Variable, dwarf_cfa) -> SimDebugVariable:
         addr = cle_variable.rebased_addr_from_cfa(dwarf_cfa)
         var_type = cle_variable.type
         return SimDebugVariable(state, addr, var_type)
 
     @property
-    def mem_untyped(self) -> "SimMemView":
+    def mem_untyped(self) -> SimMemView:
         if self.addr is None:
             raise Exception("Cannot view a variable without an address")
         return self.state.mem[self.addr]
 
     @property
-    def mem(self) -> "SimMemView":
+    def mem(self) -> SimMemView:
         if isinstance(self.type, TypedefType):
             unpacked = SimDebugVariable(self.state, self.addr, self.type.type)
             return unpacked.mem
@@ -62,12 +63,12 @@ class SimDebugVariable:
     # methods and properties equivalent to SimMemView
 
     @property
-    def string(self) -> "SimMemView":
+    def string(self) -> SimMemView:
         first_char = self.deref
         # first char should have some char type (could be checked here)
         return first_char.mem_untyped.string
 
-    def with_type(self, sim_type: "SimType") -> "SimMemView":
+    def with_type(self, sim_type: SimType) -> SimMemView:
         return self.mem_untyped.with_type(sim_type)
 
     @property
@@ -88,20 +89,20 @@ class SimDebugVariable:
     def __getitem__(self, i):
         if isinstance(i, int):
             return self.array(i)
-        elif isinstance(i, str):
+        if isinstance(i, str):
             return self.member(i)
         raise KeyError
 
     @property
-    def deref(self) -> "SimDebugVariable":
+    def deref(self) -> SimDebugVariable:
         # dereferincing is equivalent to getting the first array element
         return self.array(0)
 
-    def array(self, i) -> "SimDebugVariable":
+    def array(self, i) -> SimDebugVariable:
         if isinstance(self.type, TypedefType):
             unpacked = SimDebugVariable(self.state, self.addr, self.type.type)
             return unpacked.array(i)
-        elif isinstance(self.type, ArrayType):
+        if isinstance(self.type, ArrayType):
             # an array already addresses its first element
             addr = self.addr
             el_type = self.type.element_type
@@ -122,16 +123,13 @@ class SimDebugVariable:
             new_addr = addr + i * el_type.byte_size
         return SimDebugVariable(self.state, new_addr, el_type)
 
-    def member(self, member_name: str) -> "SimDebugVariable":
+    def member(self, member_name: str) -> SimDebugVariable:
         if isinstance(self.type, TypedefType):
             unpacked = SimDebugVariable(self.state, self.addr, self.type.type)
             return unpacked.member(member_name)
-        elif isinstance(self.type, StructType):
+        if isinstance(self.type, StructType):
             member = self.type[member_name]
-            if self.addr is None:
-                addr = None
-            else:
-                addr = self.addr + member.addr_offset
+            addr = None if self.addr is None else self.addr + member.addr_offset
             return SimDebugVariable(self.state, addr, member.type)
 
         raise Exception(f"{self.type} object has no members")
@@ -142,7 +140,7 @@ class SimDebugVariablePlugin(SimStatePlugin):
     This is the plugin you'll use to interact with (global/local) program variables.
     These variables have a name and a visibility scope which depends on the pc address of the state.
     With this plugin, you can access/modify the value of such variable or find its memory address.
-    For creating program varibles, or for importing them from cle, see the knowledge plugin debug_variables.
+    For creating program variables, or for importing them from cle, see the knowledge plugin debug_variables.
     Run ``p.kb.dvars.load_from_dwarf()`` before using this plugin.
 
     Example:
@@ -186,7 +184,7 @@ class SimDebugVariablePlugin(SimStatePlugin):
         # FIXME This is only an approximation!
         if self.state.arch.name == "AMD64":
             return self.state.regs.rbp + 16
-        elif self.state.arch.name == "X86":
+        if self.state.arch.name == "X86":
             return self.state.regs.ebp + 8
         return 0
 

angr/state_plugins/filesystem.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import os
 import logging
 from collections import namedtuple
@@ -108,10 +109,8 @@ class SimFilesystem(SimStatePlugin):  # pretends links don't exist
         for fname in self._mountpoints:
             try:
                 subdeck = [o._mountpoints[fname] for o in others]
-            except KeyError:
-                raise SimMergeError(
-                    "Can't merge filesystems with disparate file sets"
-                )  # pylint: disable=raise-missing-from
+            except KeyError as err:
+                raise SimMergeError("Can't merge filesystems with disparate file sets") from err
 
             if common_ancestor is not None and fname in common_ancestor._mountpoints:
                 common_mp = common_ancestor._mountpoints[fname]
@@ -121,10 +120,10 @@ class SimFilesystem(SimStatePlugin):  # pretends links don't exist
             self._mountpoints[fname].merge(subdeck, merge_conditions, common_ancestor=common_mp)
 
         # this is a little messy
-        deck = [self] + others
+        deck = [self, *others]
         all_files = set.union(*(set(o._files.keys()) for o in deck))
         for fname in all_files:
-            subdeck = [o._files[fname] if fname in o._files else None for o in deck]
+            subdeck = [o._files.get(fname, None) for o in deck]
             representative = next(x for x in subdeck if x is not None)
             for i, v in enumerate(subdeck):
                 if v is None:
@@ -158,9 +157,7 @@ class SimFilesystem(SimStatePlugin):  # pretends links don't exist
         keys = path.split(self.pathsep)
         i = 0
         while i < len(keys):
-            if keys[i] == b"":
-                keys.pop(i)
-            elif keys[i] == b".":
+            if keys[i] == b"" or keys[i] == b".":
                 keys.pop(i)
             elif keys[i] == b"..":
                 keys.pop(i)
@@ -191,8 +188,7 @@ class SimFilesystem(SimStatePlugin):  # pretends links don't exist
 
         if mountpoint is None:
             return self._files.get(self._join_chunks(chunks))
-        else:
-            return mountpoint.get(chunks)
+        return mountpoint.get(chunks)
 
     def insert(self, path, simfile):
         """
@@ -205,8 +201,7 @@ class SimFilesystem(SimStatePlugin):  # pretends links don't exist
         if mountpoint is None:
             self._files[self._join_chunks(chunks)] = simfile
             return True
-        else:
-            return mountpoint.insert(chunks, simfile)
+        return mountpoint.insert(chunks, simfile)
 
     def delete(self, path):
         """
@@ -370,7 +365,7 @@ class SimConcreteFilesystem(SimMount):
             self.cache[fname].set_state(state)
 
     def merge(self, others, merge_conditions, common_ancestor=None):
-        merging_occured = False
+        merging_occurred = False
 
         for o in others:
             if o.pathsep != self.pathsep:
@@ -378,7 +373,7 @@ class SimConcreteFilesystem(SimMount):
             if o.deleted_list != self.deleted_list:
                 raise SimMergeError("Can't merge concrete filesystems with disparate deleted files")
 
-        deck = [self] + others
+        deck = [self, *others]
         all_files = set.union(*(set(o._files.keys()) for o in deck))
         for fname in all_files:
             subdeck = []
@@ -396,8 +391,8 @@ class SimConcreteFilesystem(SimMount):
             else:
                 common_simfile = None
 
-            merging_occured |= subdeck[0].merge(subdeck[1:], merge_conditions, common_ancestor=common_simfile)
-        return merging_occured
+            merging_occurred |= subdeck[0].merge(subdeck[1:], merge_conditions, common_ancestor=common_simfile)
+        return merging_occurred
 
     def widen(self, others):  # pylint: disable=unused-argument
         if once("host_fs_widen_warning"):
@@ -446,7 +441,7 @@ class SimHostFilesystem(SimConcreteFilesystem):
             if dereference:
                 path = os.path.realpath(path)
             s = os.stat(path)
-            stat = Stat(
+            return Stat(
                 s.st_dev,
                 s.st_ino,
                 s.st_nlink,
@@ -464,6 +459,5 @@ class SimHostFilesystem(SimConcreteFilesystem):
                 round(s.st_ctime),
                 s.st_ctime_ns,
             )
-            return stat
         except OSError:
             return None

angr/state_plugins/gdb.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import os
 import re
 import logging
@@ -124,8 +125,8 @@ class GDB(SimStatePlugin):
     def _read_data(path):
         if not os.path.exists(path):
             raise SimStateError("File does not exist")
-        f = open(path, "rb")
-        return f.read()
+        with open(path, "rb") as f:
+            return f.read()
 
     def _write(self, addr, data):
         self.state.memory.store(addr, data)

angr/state_plugins/globals.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from .plugin import SimStatePlugin
@@ -15,7 +16,7 @@ class SimStateGlobals(SimStatePlugin):
 
     def merge(self, others, merge_conditions, common_ancestor=None):  # pylint: disable=unused-argument
         for other in others:
-            for k in other.keys():
+            for k in other:
                 if k not in self:
                     self[k] = other[k]
 
@@ -25,6 +26,9 @@ class SimStateGlobals(SimStatePlugin):
         l.warning("Widening is unimplemented for globals")
         return False
 
+    def __iter__(self):
+        return iter(self._backer)
+
     def __getitem__(self, k):
         return self._backer[k]
 

angr/state_plugins/heap/__init__.py

@@ -1,4 +1,5 @@
 # pylint:disable=wildcard-import
+from __future__ import annotations
 from .heap_base import *
 from .heap_brk import *
 from .heap_libc import *

angr/state_plugins/heap/heap_base.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from ..plugin import SimStatePlugin
 
 from ...errors import SimMemoryError

angr/state_plugins/heap/heap_brk.py

@@ -1,9 +1,12 @@
+from __future__ import annotations
+import logging
+
+import claripy
+
 from angr.errors import SimSolverError
 from ..plugin import SimStatePlugin
 from . import SimHeapBase
 
-import logging
-
 l = logging.getLogger(__name__)
 
 
@@ -60,7 +63,7 @@ class SimHeapBrk(SimHeapBase):
         """
         requested = self._conc_alloc_size(sim_size)
         used = self.heap_location - self.heap_base
-        released = requested if requested <= used else used
+        released = min(requested, used)
         self.heap_location -= released
         l.debug("Releasing %d bytes from the heap (%d bytes were requested to be released)", released, requested)
 
@@ -87,12 +90,15 @@ class SimHeapBrk(SimHeapBase):
 
         final_size = size * nmemb
 
-        if self.state.solver.symbolic(sim_nmemb) or self.state.solver.symbolic(sim_size):
-            if final_size > plugin.max_variable_size:
-                final_size = plugin.max_variable_size
+        if (
+            self.state.solver.symbolic(sim_nmemb)
+            or self.state.solver.symbolic(sim_size)
+            and final_size > plugin.max_variable_size
+        ):
+            final_size = plugin.max_variable_size
 
         addr = self.state.heap.allocate(final_size)
-        v = self.state.solver.BVV(0, final_size * 8)
+        v = claripy.BVV(0, final_size * 8)
         self.state.memory.store(addr, v)
         return addr
 
@@ -119,8 +125,7 @@ class SimHeapBrk(SimHeapBase):
         if self.heap_location != new_heap_location:
             self.heap_location = new_heap_location
             return True
-        else:
-            return False
+        return False
 
     def merge(self, others, merge_conditions, common_ancestor=None):  # pylint:disable=unused-argument
         return self._combine(others)

angr/state_plugins/heap/heap_freelist.py

@@ -1,20 +1,24 @@
+from __future__ import annotations
+import logging
 from . import SimHeapLibc
 from .utils import concretize
 from ...errors import SimHeapError
 
-import logging
 
 l = logging.getLogger("angr.state_plugins.heap.heap_freelist")
 
 
 class Chunk:
     """
-    The sort of chunk as would typically be found in a freelist-style heap implementation. Provides a representation of
-    a chunk via a view into the memory plugin. Chunks may be adjacent, in different senses, to as many as four other
-    chunks. For any given chunk, two of these chunks are adjacent to it in memory, and are referred to as the "previous"
-    and "next" chunks throughout this implementation. For any given free chunk, there may also be two significant chunks
-    that are adjacent to it in some linked list of free chunks. These chunks are referred to the "backward" and "foward"
-    chunks relative to the chunk in question.
+    The sort of chunk as would typically be found in a freelist-style heap
+    implementation. Provides a representation of a chunk via a view into the
+    memory plugin. Chunks may be adjacent, in different senses, to as many as
+    four other chunks. For any given chunk, two of these chunks are adjacent to
+    it in memory, and are referred to as the "previous" and "next" chunks
+    throughout this implementation. For any given free chunk, there may also be
+    two significant chunks that are adjacent to it in some linked list of free
+    chunks. These chunks are referred to the "backward" and "forward" chunks
+    relative to the chunk in question.
 
     :ivar base: the location of the base of the chunk in memory
     :ivar state: the program state that the chunk is resident in
@@ -106,8 +110,7 @@ class Chunk:
     def _compare(self, other, comparison):
         if self.state is other.state:
             return comparison
-        else:
-            raise SimHeapError("Chunks must originate from the same simulation state to be compared!")
+        raise SimHeapError("Chunks must originate from the same simulation state to be compared!")
 
     def __lt__(self, other):
         """

angr/state_plugins/heap/heap_libc.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from . import SimHeapBase
 
 

angr/state_plugins/heap/heap_ptmalloc.py

@@ -1,12 +1,14 @@
+from __future__ import annotations
+import logging
+
+import claripy
+
 from ..plugin import SimStatePlugin
 from .heap_freelist import SimHeapFreelist, Chunk
 from .utils import concretize
-
 from ...errors import SimHeapError, SimMergeError, SimSolverError
 
 
-import logging
-
 l = logging.getLogger("angr.state_plugins.heap.heap_ptmalloc")
 sml = logging.getLogger("angr.state_plugins.symbolic_memory")
 
@@ -55,8 +57,7 @@ class PTChunk(Chunk):
         chunk_size = self.get_size()
         if self.is_free():
             return chunk_size - 4 * self._chunk_size_t_size
-        else:
-            return chunk_size - 2 * self._chunk_size_t_size
+        return chunk_size - 2 * self._chunk_size_t_size
 
     def _set_leading_size(self, size):
         level = silence_logger()
@@ -88,9 +89,8 @@ class PTChunk(Chunk):
                 next_chunk.set_prev_freeness(is_free)
             else:
                 self.heap._set_final_freeness(is_free)
-        if is_free is not None and is_free or self.is_free():
-            if next_chunk is not None:
-                self.state.memory.store(next_chunk.base, size, size=self.state.arch.bytes)
+        if (is_free is not None and is_free or self.is_free()) and next_chunk is not None:
+            self.state.memory.store(next_chunk.base, size, size=self.state.arch.bytes)
 
     def set_prev_freeness(self, is_free):
         """
@@ -138,20 +138,19 @@ class PTChunk(Chunk):
         next_chunk = self.next_chunk()
         if next_chunk is not None:
             return next_chunk.is_prev_free()
-        else:
-            flag = (
-                self.state.memory.load(
-                    self.heap.heap_base + self.heap.heap_size - self._chunk_size_t_size, self._chunk_size_t_size
-                )
-                & CHUNK_P_MASK
+        flag = (
+            self.state.memory.load(
+                self.heap.heap_base + self.heap.heap_size - self._chunk_size_t_size, self._chunk_size_t_size
             )
+            & CHUNK_P_MASK
+        )
 
-            def sym_flag_handler(flag):
-                l.warning("The final P flag is symbolic; assuming it is not set")
-                return self.state.solver.min_int(flag)
+        def sym_flag_handler(flag):
+            l.warning("The final P flag is symbolic; assuming it is not set")
+            return self.state.solver.min_int(flag)
 
-            flag = concretize(flag, self.state.solver, sym_flag_handler)
-            return not flag
+        flag = concretize(flag, self.state.solver, sym_flag_handler)
+        return not flag
 
     def data_ptr(self):
         return self.base + (2 * self._chunk_size_t_size)
@@ -170,8 +169,7 @@ class PTChunk(Chunk):
         base = concretize(self.base + self.get_size(), self.state.solver, sym_base_handler)
         if base >= self.heap.heap_base + self.heap.heap_size - 2 * self._chunk_size_t_size:
             return None
-        else:
-            return PTChunk(base, self.state)
+        return PTChunk(base, self.state)
 
     def prev_chunk(self):
         """
@@ -182,8 +180,7 @@ class PTChunk(Chunk):
         """
         if self.is_prev_free():
             return PTChunk(self.base - self.prev_size(), self.state)
-        else:
-            raise SimHeapError("Attempted to access the previous chunk, but it was not free")
+        raise SimHeapError("Attempted to access the previous chunk, but it was not free")
 
     def fwd_chunk(self):
         """
@@ -197,8 +194,7 @@ class PTChunk(Chunk):
                 self.base + 2 * self._chunk_size_t_size, self._chunk_size_t_size, endness=self.state.arch.memory_endness
             )
             return PTChunk(base, self.state)
-        else:
-            raise SimHeapError("Attempted to access the forward chunk of an allocated chunk")
+        raise SimHeapError("Attempted to access the forward chunk of an allocated chunk")
 
     def set_fwd_chunk(self, fwd):
         self.state.memory.store(
@@ -220,8 +216,7 @@ class PTChunk(Chunk):
                 self.base + 3 * self._chunk_size_t_size, self._chunk_size_t_size, endness=self.state.arch.memory_endness
             )
             return PTChunk(base, self.state)
-        else:
-            raise SimHeapError("Attempted to access the backward chunk of an allocated chunk")
+        raise SimHeapError("Attempted to access the backward chunk of an allocated chunk")
 
     def set_bck_chunk(self, bck):
         self.state.memory.store(
@@ -338,11 +333,10 @@ class SimHeapPTMalloc(SimHeapFreelist):
                 cur = fwd
                 fwd = cur.fwd_chunk()
             return cur
-        else:
-            while fwd != self.free_head_chunk:
-                cur = fwd
-                fwd = cur.fwd_chunk()
-            return cur
+        while fwd != self.free_head_chunk:
+            cur = fwd
+            fwd = cur.fwd_chunk()
+        return cur
 
     def _set_final_freeness(self, flag):
         """
@@ -364,7 +358,7 @@ class SimHeapPTMalloc(SimHeapFreelist):
         """
         size = req_size
         size += 2 * self._chunk_size_t_size  # Two size fields
-        size = self._chunk_min_size if size < self._chunk_min_size else size
+        size = max(size, self._chunk_min_size)
         if size & self._chunk_align_mask:  # If the chunk would not be aligned
             size = (size & ~self._chunk_align_mask) + self._chunk_align_mask + 1  # Fix it
         return size
@@ -394,8 +388,7 @@ class SimHeapPTMalloc(SimHeapFreelist):
                 if fwd <= free_chunk:
                     l.debug("No free chunks of sufficient size available")
                     return 0
-                else:
-                    free_chunk = fwd
+                free_chunk = fwd
             elif free_size > size and free_size - size >= self._chunk_min_size:
                 # Chunk may be too large but we'll use it anyway
                 chunk = free_chunk
@@ -526,7 +519,7 @@ class SimHeapPTMalloc(SimHeapFreelist):
         if addr == 0:
             return 0
         if size != 0:
-            z = self.state.solver.BVV(0, size * 8)
+            z = claripy.BVV(0, size * 8)
             self.state.memory.store(addr, z)
         return addr
 
@@ -563,7 +556,7 @@ class SimHeapPTMalloc(SimHeapFreelist):
             self.state.memory.store(new_data_ptr, old_data)
             self.free(old_data_ptr)  # Free the old chunk
             return new_data_ptr
-        elif new_size < old_size and old_size - new_size >= self._chunk_min_size:
+        if new_size < old_size and old_size - new_size >= self._chunk_min_size:
             # Less space is needed, so just shrink the chunk and create a new free chunk from the freed space
             chunk.set_size(new_size, False)
             new_next_chunk = chunk.next_chunk()
@@ -571,9 +564,8 @@ class SimHeapPTMalloc(SimHeapFreelist):
             new_next_chunk.set_prev_freeness(False)
             self.free(new_next_chunk.data_ptr())
             return chunk.data_ptr()
-        else:
-            # No changes needed; we're already the right size
-            return chunk.data_ptr()
+        # No changes needed; we're already the right size
+        return chunk.data_ptr()
 
     def _malloc(self, sim_size):
         return self.malloc(sim_size)

angr/state_plugins/heap/utils.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from ...errors import SimSolverError
 
 

angr/state_plugins/history.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from collections.abc import Reversible
 import operator
 import logging
@@ -112,11 +113,11 @@ class SimStateHistory(SimStatePlugin):
         if addr is None:
             addr_str = "Unknown"
         elif isinstance(addr, int):
-            addr_str = "%#x" % addr
+            addr_str = f"{addr:#x}"
         else:
             addr_str = repr(addr)
 
-        return "<StateHistory @ %s>" % addr_str
+        return f"<StateHistory @ {addr_str}>"
 
     def set_strongref_state(self, state):
         if sim_options.EFFICIENT_STATE_MERGING in state.options:
@@ -140,17 +141,19 @@ class SimStateHistory(SimStatePlugin):
         self.parent = common_ancestor if common_ancestor is not None else self.parent
 
         # rebuild recent constraints
-        recent_constraints = [h.constraints_since(common_ancestor) for h in itertools.chain([self], others)]
+        recent_constraints = [
+            [c.ast for c in h.constraints_since(common_ancestor)] for h in itertools.chain([self], others)
+        ]
         if sim_options.SIMPLIFY_MERGED_CONSTRAINTS in self.state.options:
-            combined_constraint = self.state.solver.Or(
+            combined_constraint = claripy.Or(
                 *[
-                    self.state.solver.simplify(self.state.solver.And(*history_constraints))
+                    self.state.solver.simplify(claripy.And(*history_constraints))
                     for history_constraints in recent_constraints
                 ]
             )
         else:
-            combined_constraint = self.state.solver.Or(
-                *[self.state.solver.And(*history_constraints) for history_constraints in recent_constraints]
+            combined_constraint = claripy.Or(
+                *[claripy.And(*history_constraints) for history_constraints in recent_constraints]
             )
         self.recent_events = [
             e.recent_events for e in itertools.chain([self], others) if not isinstance(e, SimActionConstraint)
@@ -254,9 +257,7 @@ class SimStateHistory(SimStatePlugin):
                 if addr.symbolic:
                     return False
                 addr = self.state.solver.eval(addr)
-            if addr != read_offset:
-                return False
-            return True
+            return addr == read_offset
 
         def action_writes(action):
             if action.type != write_type:
@@ -272,9 +273,7 @@ class SimStateHistory(SimStatePlugin):
                 if addr.symbolic:
                     return False
                 addr = self.state.solver.eval(addr)
-            if addr != write_offset:
-                return False
-            return True
+            return addr == write_offset
 
         return [
             x
@@ -359,11 +358,11 @@ class SimStateHistory(SimStatePlugin):
             yield from self.parent.lineage
 
     @property
-    def events(self) -> Reversible["SimEvent"]:
+    def events(self) -> Reversible[SimEvent]:
         return LambdaIterIter(self, operator.attrgetter("recent_events"))
 
     @property
-    def actions(self) -> Reversible["SimAction"]:
+    def actions(self) -> Reversible[SimAction]:
         return LambdaIterIter(self, operator.attrgetter("recent_actions"))
 
     @property

angr/state_plugins/inspect.py

@@ -1,4 +1,5 @@
 # TODO: SimValue being able to compare two symbolics for is_solution
+from __future__ import annotations
 
 import logging
 

angr/state_plugins/javavm_classloader.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from archinfo.arch_soot import SootAddressDescriptor, SootAddressTerminator, SootClassDescriptor
@@ -83,7 +84,7 @@ class SimJavaVmClassloader(SimStatePlugin):
         self.initialized_classes.add(class_)
 
         if not class_.is_loaded:
-            l.warning("Class %r is not loaded in CLE. Skip initializiation.", class_)
+            l.warning("Class %r is not loaded in CLE. Skip initialization.", class_)
             return
 
         clinit_method = resolve_method(
@@ -106,7 +107,7 @@ class SimJavaVmClassloader(SimStatePlugin):
             self.state.memory.vm_static_table = simgr.deadended[-1].memory.vm_static_table.copy()
             self.state.memory.heap = simgr.deadended[-1].memory.heap.copy()
         else:
-            l.debug("Class initializer <clinit> is not loaded in CLE. Skip initializiation.")
+            l.debug("Class initializer <clinit> is not loaded in CLE. Skip initialization.")
 
     @property
     def initialized_classes(self):

angr/state_plugins/jni_references.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 
 from ..sim_state import SimState
@@ -72,7 +73,7 @@ class SimStateJNIReferences(SimStatePlugin):
 
     def _get_reference_value(self, opaque_ref):
         if self.state.solver.symbolic(opaque_ref):
-            raise NotImplementedError("Opaque reference %s is symbolic." % opaque_ref.to_claripy())
+            raise NotImplementedError(f"Opaque reference {opaque_ref.to_claripy()} is symbolic.")
         return self.state.solver.eval(opaque_ref)
 
     @SimStatePlugin.memo