crosshair-tool 0.0.86__cp310-cp310-macosx_11_0_arm64.whl → 0.0.87__cp310-cp310-macosx_11_0_arm64.whl

crosshair/__init__.py

@@ -15,7 +15,7 @@ from crosshair.statespace import StateSpace
 from crosshair.tracers import NoTracing, ResumedTracing
 from crosshair.util import IgnoreAttempt, debug
 
-__version__ = "0.0.86"  # Do not forget to update in setup.py!
+__version__ = "0.0.87"  # Do not forget to update in setup.py!
 __author__ = "Phillip Schanely"
 __license__ = "MIT"
 __status__ = "Alpha"

crosshair/_mark_stacks.h

@@ -538,23 +538,6 @@ static const uint8_t _ch_DE_INSTRUMENT[256] = {
 #endif
 #endif
 
-/* Get the underlying opcode, stripping instrumentation */
-int _ch_Py_GetBaseOpcode(PyCodeObject *code, int i)
-{
-    int opcode = _PyCode_CODE(code)[i].op.code;
-    if (opcode == INSTRUMENTED_LINE) {
-        opcode = code->_co_monitoring->lines[i].original_opcode;
-    }
-    if (opcode == INSTRUMENTED_INSTRUCTION) {
-        opcode = code->_co_monitoring->per_instruction_opcodes[i];
-    }
-    int deinstrumented = _ch_DE_INSTRUMENT[opcode];
-    if (deinstrumented) {
-        return deinstrumented;
-    }
-    return _ch_PyOpcode_Deopt[opcode];
-}
-
 static int64_t *
 _ch_mark_stacks(PyCodeObject *code_obj, int len)
 {
@@ -602,14 +585,14 @@ _ch_mark_stacks(PyCodeObject *code_obj, int len)
         /* Scan instructions */
         for (i = 0; i < len;) {
             int64_t next_stack = stacks[i];
-            opcode = _ch_Py_GetBaseOpcode(code_obj, i);
+            opcode = code[i].op.code;
             uint8_t trace_enabled_here = _ch_TRACABLE_INSTRUCTIONS[opcode];
             enabled_tracing[i] |= trace_enabled_here;
             int oparg = 0;
             while (opcode == EXTENDED_ARG) {
                 oparg = (oparg << 8) | code[i].op.arg;
                 i++;
-                opcode = _ch_Py_GetBaseOpcode(code_obj, i);
+                opcode = code[i].op.code;
                 stacks[i] = next_stack;
             }
             int next_i = i + _ch_PyOpcode_Caches[opcode] + 1;

crosshair/auditwall.py

@@ -1,4 +1,5 @@
 import importlib
+import inspect
 import os
 import sys
 import traceback
@@ -28,9 +29,10 @@ def reject(event: str, args: Tuple) -> None:
 
 
 def inside_module(modules: Iterable[ModuleType]) -> bool:
-    files = {m.__file__ for m in modules}
-    for frame, lineno in traceback.walk_stack(None):
-        if frame.f_code.co_filename in files:
+    """Checks whether the current call stack is inside one of the given modules."""
+    for frame, _lineno in traceback.walk_stack(None):
+        frame_module = inspect.getmodule(frame)
+        if frame_module and frame_module in modules:
             return True
     return False
 
@@ -60,7 +62,7 @@ def check_msvcrt_open(event: str, args: Tuple) -> None:
 _MODULES_THAT_CAN_POPEN: Optional[Set[ModuleType]] = None
 
 
-def modules_with_allowed_popen():
+def modules_with_allowed_subprocess():
     global _MODULES_THAT_CAN_POPEN
     if _MODULES_THAT_CAN_POPEN is None:
         allowed_module_names = ("_aix_support", "ctypes", "platform", "uuid")
@@ -74,13 +76,14 @@ def modules_with_allowed_popen():
 
 
 def check_subprocess(event: str, args: Tuple) -> None:
-    if not inside_module(modules_with_allowed_popen()):
+    if not inside_module(modules_with_allowed_subprocess()):
         reject(event, args)
 
 
 _SPECIAL_HANDLERS = {
     "open": check_open,
     "subprocess.Popen": check_subprocess,
+    "os.posix_spawn": check_subprocess,
     "msvcrt.open_osfhandle": check_msvcrt_open,
 }
 

crosshair/libimpl/builtinslib.py

@@ -267,7 +267,7 @@ class SymbolicValue(CrossHairValue):
         self.snapshot = SnapshotRef(-1)
         self.python_type = typ
         if type(smtvar) is str:
-            self.var = self.__init_var__(typ, smtvar)
+            self.var: Any = self.__init_var__(typ, smtvar)
         else:
             self.var = smtvar
             # TODO test that smtvar's sort matches expected?
@@ -838,19 +838,6 @@ def setup_binops():
 
     setup_binop(_, {ops.lshift, ops.rshift})
 
-    _AND_MASKS_TO_MOD = {
-        # It's common to use & to mask low bits. We can avoid realization by converting
-        # these situations into mod operations.
-        0x01: 2,
-        0x03: 4,
-        0x07: 8,
-        0x0F: 16,
-        0x1F: 32,
-        0x3F: 64,
-        0x7F: 128,
-        0xFF: 256,
-    }
-
     def _(op: BinFn, a: Integral, b: Integral):
         with NoTracing():
             if isinstance(b, SymbolicInt):
@@ -861,9 +848,12 @@ def setup_binops():
             b = realize(b)
             if b == 0:
                 return 0
-            mask_mod = _AND_MASKS_TO_MOD.get(b)
-            if mask_mod and isinstance(a, SymbolicInt):
-                if context_statespace().smt_fork(a.var >= 0, probability_true=0.75):
+            # It's common to use & to mask low bits. We can avoid realization by converting
+            # these situations into mod operations.
+            mask_mod = b + 1
+            if b > 0 and mask_mod & b == 0 and isinstance(a, SymbolicInt):  # type: ignore
+                space = context_statespace()
+                if space.smt_fork(a.var >= 0, probability_true=0.75):
                     return SymbolicInt(a.var % mask_mod)
                 else:
                     return SymbolicInt(b - ((-a.var - 1) % mask_mod))

{crosshair_tool-0.0.86.dist-info → crosshair_tool-0.0.87.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crosshair-tool
-Version: 0.0.86
+Version: 0.0.87
 Summary: Analyze Python code for correctness using symbolic execution.
 Home-page: https://github.com/pschanely/CrossHair
 Author: Phillip Schanely
@@ -46,7 +46,7 @@ Requires-Dist: pytest-xdist; extra == "dev"
 Requires-Dist: setuptools; extra == "dev"
 Requires-Dist: sphinx>=3.4.3; extra == "dev"
 Requires-Dist: sphinx-rtd-theme>=0.5.1; extra == "dev"
-Requires-Dist: wheel; extra == "dev"
+Requires-Dist: rst2pdf>=0.102; extra == "dev"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{crosshair_tool-0.0.86.dist-info → crosshair_tool-0.0.87.dist-info}/RECORD

@@ -1,4 +1,4 @@
-_crosshair_tracers.cpython-310-darwin.so,sha256=6QxOavUuH2RHvD_OraUCdtkay3jxPP_lB_1gygjgKkk,56920
+_crosshair_tracers.cpython-310-darwin.so,sha256=yW6qq9EVRhOsF4H2j9nnhgQYPfiFuz0l4zyaPkKZyqg,56920
 crosshair/_tracers_pycompat.h,sha256=6IYnbQxrYkhBsLDAHSX25DPOwo1oYHCZUVWZ8c7YCnQ,14356
 crosshair/pure_importer.py,sha256=-t4eowrZOQmfqK1N2tjI5POoaxRGavytwMmbRivelFg,878
 crosshair/options.py,sha256=htQNgnrpoRjSNq6rfLBAF8nos-NNIwmP6tQYyI8ugsM,6775
@@ -23,7 +23,7 @@ crosshair/fnutil.py,sha256=X80bD2Lh4QAh-rF561r3JRxjxcuZepF3hJaxaj1GG9s,13123
 crosshair/unicode_categories.py,sha256=g4pnUPanx8KkpwI06ZUGx8GR8Myruf_EpTjyti_V4z8,333519
 crosshair/copyext.py,sha256=GBGQP9YAHoezLXwb_M59Hh1VXSou5EQt4ZmmUA0T_og,4899
 crosshair/_tracers_test.py,sha256=KpCGspjOUeZuhwTYgn_RxI4M4wMbT5rldusFDgneQ6M,3596
-crosshair/__init__.py,sha256=BqE2fB9um9PltLa0yX7EVsyAzVpgDe5EBvIiEhQ2exI,936
+crosshair/__init__.py,sha256=pCHAq8T8tcr3KLNCJY6xCK4MAWSn-XIiJTIrjTaMpPE,936
 crosshair/core.py,sha256=K7147xrvcvtrP1T9oIRywq2uHMMsIu8ZwFZWBQXPozg,63634
 crosshair/path_cover.py,sha256=wV0Vy8IPDzqXQ2VI8a94FxltS9p-Y1oF17OKePjvpgs,6710
 crosshair/enforce_test.py,sha256=C6CQ4P1FjkdIJeJg3aJynp1iLDCE6BFCEVtSqXbvmQk,4665
@@ -32,7 +32,7 @@ crosshair/core_test.py,sha256=H6qZFBFuUhgh9qWgxxc1Cs7xuC8s6FYvewmTYUh0Dpg,32200
 crosshair/codeconfig.py,sha256=GgF-ND8Ha3FysSTQ-JuezHjlhGVBbo5aCJov1Ps3VSE,3959
 crosshair/util_test.py,sha256=_KTQ0O4cLhF1pAeB8Y8Cyqbd0UyZf5KxJUaiA-ew-tE,4676
 crosshair/watcher_test.py,sha256=Ef1YSwy68wWPR5nPjwvEKPqxltI9pE9lTbnesmDy3Bk,2764
-crosshair/auditwall.py,sha256=FjpeqM6HxsKYEfVJ20CRzkQu1I2zt1dpzwejrDp-W9U,4975
+crosshair/auditwall.py,sha256=sqOmfXQLgmGfWS7b8SmVv66eFM2owaGn-4Ppq453VLI,5138
 crosshair/simplestructs_test.py,sha256=6uDdrSISHLhwnFuESkR8mUGw7m1llM6vCNDFChkfSs8,8639
 crosshair/z3util_test.py,sha256=CZovn4S9mYcG_yQegcxm80VHrvUdvNei0gvGTF9TOrk,173
 crosshair/diff_behavior.py,sha256=_5X_pTN0_-rSPrh8dfpODJG_phFMn7fWc-_zLgO3UTk,11253
@@ -43,7 +43,7 @@ crosshair/stubs_parser_test.py,sha256=0itTT0Udul_51RJXNv6KB97z44gYze6NZfKJL7yIDz
 crosshair/options_test.py,sha256=lzA-XtwEwQPa4wV1wwhCRKhyLOvIhThU9WK5QRaRbxQ,379
 crosshair/patch_equivalence_test.py,sha256=mvYpsbHZS2AiQra-jK8T8QywAG1gNNCUNQPPWI9k5t8,2506
 crosshair/abcstring.py,sha256=ROU8LzS7kfEU2L_D3QfhVxIjrYr1VctwUWfylC7KlCc,6549
-crosshair/_mark_stacks.h,sha256=rvIET5OGjKMcUZxEtIb9RhxRDveAfPXb3HLZZWfM3Bs,29261
+crosshair/_mark_stacks.h,sha256=j86qubOUvVhoR19d74iQ084RrTEq8M6oT4wJsGQUySY,28678
 crosshair/fuzz_core_test.py,sha256=q7WsZt6bj5OJrXaVsT3JaRYWWnL8X_1flSfty4Z7CcA,16903
 crosshair/unicode_categories_test.py,sha256=ZAU37IDGm9PDvwy_CGFcrF9Waa8JuUNdI4aq74wkB6c,739
 crosshair/statespace_test.py,sha256=LOblIarBbcB9oD_gVR5kK_4P2PWQymVGgJr3wNqP3Fs,2621
@@ -107,7 +107,7 @@ crosshair/libimpl/binascii_test.py,sha256=LOBqLAJ77Kx8vorjVTaT3X0Z93zw4P5BvwUapM
 crosshair/libimpl/collectionslib_test.py,sha256=3h7XTToKWauMhjrEwLXVI0jT8FZKBlkvlw0oiPMmuKM,9164
 crosshair/libimpl/timelib.py,sha256=MXEFOZjFGa1-yLvmB3l3DFTLF9PSluOlmRK-ZJaA_oI,2409
 crosshair/libimpl/jsonlib_test.py,sha256=U40WJf-69dtflz75sIsl5zA3IV5R6Ltc4Z9jv_Fh-Fw,1382
-crosshair/libimpl/builtinslib.py,sha256=9qAV1xZ2oZrIrpfWQ3BXgnY0nK2Gjov4v207x43lTq4,171629
+crosshair/libimpl/builtinslib.py,sha256=NjTvFTdPwQcBWC4PWmnD73rK37eXUp3pdwRoz2-IBEI,171512
 crosshair/libimpl/mathlib_test.py,sha256=QShLCXHdv3tx5PQxcSoR0MHeZ1huaiV6d3u7C2mGOn4,1861
 crosshair/libimpl/fractionlib.py,sha256=qdbiAHHC480YdKq3wYK_piZ3UD7oT64YfuNclypMUfQ,458
 crosshair/libimpl/binascii_ch_test.py,sha256=hFqSfF1Q8jl2LNBIWaQ6vBJIIshPOmSwrR0T1Ko4Leo,1009
@@ -166,9 +166,9 @@ crosshair/libimpl/encodings/ascii.py,sha256=Cz1xraTkXdQ5aBKDkorX4rAvrmf877_EqzC9
 crosshair/libimpl/encodings/__init__.py,sha256=5LTEj1M-S00eZ4rfQWczAixg57vyh_9vZ5m5EKB5Ksc,680
 crosshair/libimpl/encodings/latin_1.py,sha256=ftUsPjUb9L7UKXKi9P7OAqOl9FkNP98M9jMAvseXBCQ,1242
 crosshair/libimpl/encodings/_encutil.py,sha256=nwVWqcGM1f7-hAC3Z46KnfrLzAjhfy4zaTa11uVBk6M,6828
-crosshair_tool-0.0.86.dist-info/RECORD,,
-crosshair_tool-0.0.86.dist-info/WHEEL,sha256=Yc1Aaan5paVnU6MVCcfib-ZX3m-WFGdydmhB234qDSA,136
-crosshair_tool-0.0.86.dist-info/entry_points.txt,sha256=u5FIPVn1jqn4Kzg5K_iNnbP6L4hQw5FWjQ0UMezG2VE,96
-crosshair_tool-0.0.86.dist-info/top_level.txt,sha256=2jLWtM-BWg_ZYNbNfrcds0HFZD62a6J7ZIbcgcQrRk4,29
-crosshair_tool-0.0.86.dist-info/METADATA,sha256=8n0ualxjh4y_waUzDZfliJjet2bID8tHk6kQIiwX2-M,6717
-crosshair_tool-0.0.86.dist-info/licenses/LICENSE,sha256=NVyMvNqn1pH6RSHs6RWRcJyJvORnpgGFBlF73buqYJ0,4459
+crosshair_tool-0.0.87.dist-info/RECORD,,
+crosshair_tool-0.0.87.dist-info/WHEEL,sha256=11kMdE9gzbsaQG30fRcsAYxBLEVRsqJo098Y5iL60Xo,136
+crosshair_tool-0.0.87.dist-info/entry_points.txt,sha256=u5FIPVn1jqn4Kzg5K_iNnbP6L4hQw5FWjQ0UMezG2VE,96
+crosshair_tool-0.0.87.dist-info/top_level.txt,sha256=2jLWtM-BWg_ZYNbNfrcds0HFZD62a6J7ZIbcgcQrRk4,29
+crosshair_tool-0.0.87.dist-info/METADATA,sha256=5fceVgbFzOQhEoI4B8xJdNGOUd2aAftv63dxpz6Dp0E,6726
+crosshair_tool-0.0.87.dist-info/licenses/LICENSE,sha256=NVyMvNqn1pH6RSHs6RWRcJyJvORnpgGFBlF73buqYJ0,4459

{crosshair_tool-0.0.86.dist-info → crosshair_tool-0.0.87.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: false
 Tag: cp310-cp310-macosx_11_0_arm64
 Generator: delocate 0.13.0