angr 9.2.118__py3-none-win_amd64.whl → 9.2.120__py3-none-win_amd64.whl

angr/procedures/definitions/win32_wofutil.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_ws2_32.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_wscapi.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_wsclient.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_wsdapi.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_wsmsvc.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_wsnmp32.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_wtsapi32.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_xaudio2_8.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_xinput1_4.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_xinputuap.py

@@ -2,9 +2,9 @@
 from __future__ import annotations
 import logging
 
-from ...sim_type import SimTypeFunction,     SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat,     SimTypePointer,     SimTypeChar,     SimStruct,     SimTypeFixedSizeArray,     SimTypeBottom,     SimUnion,     SimTypeBool
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeFixedSizeArray, SimTypeBottom, SimUnion, SimTypeBool
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_xmllite.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_xolehlp.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/definitions/win32_xpsprint.py

@@ -3,24 +3,9 @@ from __future__ import annotations
 import logging
 from collections import OrderedDict
 
-from ...sim_type import (SimTypeFunction,
-    SimTypeShort,
-    SimTypeInt,
-    SimTypeLong,
-    SimTypeLongLong,
-    SimTypeDouble,
-    SimTypeFloat,
-    SimTypePointer,
-    SimTypeChar,
-    SimStruct,
-    SimTypeArray,
-    SimTypeBottom,
-    SimUnion,
-    SimTypeBool,
-    SimTypeRef,
-)
-from ...calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
-from .. import SIM_PROCEDURES as P
+from angr.sim_type import SimTypeFunction, SimTypeShort, SimTypeInt, SimTypeLong, SimTypeLongLong, SimTypeDouble, SimTypeFloat, SimTypePointer, SimTypeChar, SimStruct, SimTypeArray, SimTypeBottom, SimUnion, SimTypeBool, SimTypeRef
+from angr.calling_conventions import SimCCStdcall, SimCCMicrosoftAMD64
+from angr.procedures import SIM_PROCEDURES as P
 from . import SimLibrary
 
 

angr/procedures/glibc/scanf.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from ..libc.scanf import scanf
-from ..libc.fscanf import fscanf
+from angr.procedures.libc.scanf import scanf
+from angr.procedures.libc.fscanf import fscanf
 
 
 class __isoc99_scanf(scanf):

angr/procedures/glibc/sscanf.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ..libc.sscanf import sscanf
+from angr.procedures.libc.sscanf import sscanf
 
 
 class __isoc99_sscanf(sscanf):

angr/procedures/java/__init__.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
+
 import itertools
 
-from ...sim_procedure import SimProcedure
-from ...engines.soot.values import SimSootValue_Local, SimSootValue_ParamRef, translate_value
-from ...engines.soot.expressions import translate_expr
+from angr.sim_procedure import SimProcedure
+from angr.engines.soot.values import SimSootValue_Local, SimSootValue_ParamRef
 
 
 class JavaSimProcedure(SimProcedure):
@@ -37,3 +37,6 @@ class JavaSimProcedure(SimProcedure):
 
     def _prepare_ret_state(self):
         self._engine.prepare_return_state(self.state, self.ret_expr)
+
+
+__all__ = ("JavaSimProcedure",)

angr/procedures/java/unconstrained.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 import claripy
 
 from . import JavaSimProcedure
-from ...engines.soot.values import SimSootValue_ThisRef, SimSootValue_StringRef
-from ...engines.soot.expressions import SimSootExpr_NewArray
-from ... import sim_options as options
+from angr.engines.soot.values import SimSootValue_ThisRef, SimSootValue_StringRef
+from angr.engines.soot.expressions import SimSootExpr_NewArray
+from angr import sim_options as options
 
 
 class UnconstrainedMethod(JavaSimProcedure):
@@ -33,7 +33,7 @@ class UnconstrainedMethod(JavaSimProcedure):
             ret_value = claripy.FPS(f"unc_double_{method_descriptor.name}", claripy.FSORT_DOUBLE)
         elif method_descriptor.ret == "java.lang.String":
             str_ref = SimSootValue_StringRef.new_string(
-                self.state, claripy.StringS(f"unc_string_{method_descriptor.name}", 1000)
+                self.state, claripy.StringS(f"unc_string_{method_descriptor.name}")
             )
             ret_value = str_ref
         elif method_descriptor.ret.endswith("[][]"):

angr/procedures/java_io/read.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ..java import JavaSimProcedure
+from angr.procedures.java import JavaSimProcedure
 
 
 class Read(JavaSimProcedure):

angr/procedures/java_io/write.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ..java import JavaSimProcedure
+from angr.procedures.java import JavaSimProcedure
 
 
 class Write(JavaSimProcedure):

angr/procedures/java_jni/__init__.py

@@ -7,10 +7,10 @@ import typing
 from archinfo import ArchSoot
 import claripy
 
-from ...calling_conventions import default_cc
-from ...sim_procedure import SimProcedure
-from ...sim_type import SimTypeFunction
-from ...state_plugins.sim_action_object import SimActionObject
+from angr.calling_conventions import default_cc
+from angr.sim_procedure import SimProcedure
+from angr.sim_type import SimTypeFunction
+from angr.state_plugins.sim_action_object import SimActionObject
 
 l = logging.getLogger("angr.procedures.java_jni")
 
@@ -152,8 +152,18 @@ class JNISimProcedure(SimProcedure):
                             If not set, native memory is allocated.
         :return:            Native address of the string.
         """
+        # warn if string is symbolic
+        if self.state.solver.symbolic(string):
+            l.warning(
+                "Support for symbolic strings, passed to native code, is limited. "
+                "Length will be concretized immediately. String value will get "
+                "concretized after `ReleaseStringUTFChars` is called."
+            )
+
+        length = self.state.solver.eval(claripy.StrLen(string)) * 8
+
         if addr is None:
-            addr = self._allocate_native_memory(size=len(string) + 1)
+            addr = self._allocate_native_memory(size=length + 1)
         else:
             # check if addr is symbolic
             if self.state.solver.symbolic(addr):
@@ -163,21 +173,19 @@ class JNISimProcedure(SimProcedure):
                 )
             addr = self.state.solver.eval(addr)
 
-        # warn if string is symbolic
-        if self.state.solver.symbolic(string):
-            l.warning(
-                "Support for symbolic strings, passed to native code, is limited. "
-                "String will get concretized after `ReleaseStringUTFChars` is called."
-            )
-
         # store chars one by one
-        str_len = len(string) // 8
-        for idx in range(str_len):
-            str_byte = claripy.StrSubstr(idx, 1, string)
-            self.state.memory.store(addr + idx, str_byte)
+        if string.symbolic:
+            bvs = claripy.BVS(next(iter(string.variables)), length)
+            self.state.memory.store(addr, bvs)
+        else:
+            str_len = length // 8
+            for idx in range(str_len):
+                str_byte = claripy.StrSubstr(idx, 1, string)
+                as_bv = claripy.BVV(ord(self.state.solver.eval(str_byte)), 8)
+                self.state.memory.store(addr + idx, as_bv)
 
         # store terminating zero
-        self.state.memory.store(len(string), claripy.BVV(0, 8))
+        self.state.memory.store(length, claripy.BVV(0, 8))
 
         return addr
 

angr/procedures/java_jni/array_operations.py

@@ -4,8 +4,8 @@ import logging
 import claripy
 
 from . import JNISimProcedure
-from ...engines.soot.expressions import SimSootExpr_NewArray
-from ...engines.soot.values import SimSootValue_ArrayRef
+from angr.engines.soot.expressions import SimSootExpr_NewArray
+from angr.engines.soot.values import SimSootValue_ArrayRef
 
 l = logging.getLogger("angr.procedures.java_jni.array_operations")
 

angr/procedures/java_jni/field_access.py

@@ -4,9 +4,9 @@ import logging
 from archinfo.arch_soot import ArchSoot
 
 from . import JNISimProcedure
-from ...engines.soot.exceptions import SootFieldNotLoadedException
-from ...engines.soot.field_dispatcher import resolve_field
-from ...engines.soot.values import SimSootValue_InstanceFieldRef, SimSootValue_StaticFieldRef
+from angr.engines.soot.exceptions import SootFieldNotLoadedException
+from angr.engines.soot.field_dispatcher import resolve_field
+from angr.engines.soot.values import SimSootValue_InstanceFieldRef, SimSootValue_StaticFieldRef
 
 l = logging.getLogger("angr.procedures.java_jni.field_access")
 

angr/procedures/java_jni/method_calls.py

@@ -4,8 +4,8 @@ import logging
 from archinfo.arch_soot import ArchSoot, SootAddressDescriptor, SootArgument, SootMethodDescriptor
 
 from . import JNISimProcedure
-from ...calling_conventions import SimCCSoot
-from ...engines.soot.method_dispatcher import resolve_method
+from angr.calling_conventions import SimCCSoot
+from angr.engines.soot.method_dispatcher import resolve_method
 
 l = logging.getLogger("angr.procedures.java_jni.callmethod")
 

angr/procedures/java_jni/object_operations.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from . import JNISimProcedure
-from ...engines.soot.values import SimSootValue_ThisRef
+from angr.engines.soot.values import SimSootValue_ThisRef
 from .method_calls import CallMethodBase
 
 # pylint: disable=arguments-differ,unused-argument

angr/procedures/java_jni/string_operations.py

@@ -4,7 +4,7 @@ import logging
 from claripy import StringV, StrLen
 
 from . import JNISimProcedure
-from ...engines.soot.values import SimSootValue_StringRef
+from angr.engines.soot.values import SimSootValue_StringRef
 
 l = logging.getLogger("angr.procedures.java_jni.string_operations")
 
@@ -84,4 +84,4 @@ class GetStringUTFLength(JNISimProcedure):
     def run(self, ptr_env, str_ref_):
         str_ref = self.state.jni_references.lookup(str_ref_)
         str_val = self.state.javavm_memory.load(str_ref)
-        return StrLen(str_val, 32)
+        return StrLen(str_val)

angr/procedures/java_lang/character.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import claripy
 import logging
 
-from ..java import JavaSimProcedure
+from angr.procedures.java import JavaSimProcedure
 
 log = logging.getLogger(name=__name__)
 

angr/procedures/java_lang/double.py

@@ -3,7 +3,7 @@ import logging
 
 import claripy
 
-from ..java import JavaSimProcedure
+from angr.procedures.java import JavaSimProcedure
 
 log = logging.getLogger(name=__name__)
 
@@ -21,4 +21,4 @@ class ParseDouble(JavaSimProcedure):
             double_val = float(str_value)
             return claripy.FPV(double_val, claripy.FSORT_DOUBLE)
 
-        return claripy.StrToInt(str_, self.arch.bits)
+        return claripy.StrToInt(str_)

angr/procedures/java_lang/exit.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ..java import JavaSimProcedure
+from angr.procedures.java import JavaSimProcedure
 
 # pylint: disable=arguments-differ,unused-argument
 

angr/procedures/java_lang/getsimplename.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import logging
 
-from ..java import JavaSimProcedure
+from angr.procedures.java import JavaSimProcedure
 from angr.engines.soot.values.strref import SimSootValue_StringRef
 
 l = logging.getLogger(name=__name__)

angr/procedures/java_lang/integer.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 import claripy
 import logging
 
-from ..java import JavaSimProcedure
-from ...engines.soot.values import SimSootValue_StringRef, SimSootValue_ThisRef
+from angr.procedures.java import JavaSimProcedure
+from angr.engines.soot.values import SimSootValue_StringRef, SimSootValue_ThisRef
 
 log = logging.getLogger(name=__name__)
 

angr/procedures/java_lang/load_library.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ..java import JavaSimProcedure
+from angr.procedures.java import JavaSimProcedure
 
 
 class LoadLibrary(JavaSimProcedure):