Merge branch 'main' into dependabot/pip/werkzeug-3.0.1

protectai · Nov 6, 2023 · 379d920 · 379d920
2 parents 1e1a865 + d9c972c
commit 379d920
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/modelscan/tools/picklescanner.py b/modelscan/tools/picklescanner.py
@@ -133,15 +133,20 @@ def _list_globals(
             op_name = op[0].name
             op_value: str = op[1]
 
-            if op_name == "MEMOIZE" and n > 0:
+            if op_name in ["MEMOIZE", "PUT", "BINPUT", "LONG_BINPUT"] and n > 0:
                 memo[len(memo)] = ops[n - 1][1]
 
             if op_name in ["GLOBAL", "INST"]:
                 globals.add(tuple(op_value.split(" ", 1)))
             elif op_name == "STACK_GLOBAL":
                 values: List[str] = []
                 for offset in range(1, n):
-                    if ops[n - offset][0].name == "MEMOIZE":
+                    if ops[n - offset][0].name in [
+                        "MEMOIZE",
+                        "PUT",
+                        "BINPUT",
+                        "LONG_BINPUT",
+                    ]:
                         continue
                     if ops[n - offset][0].name in ["GET", "BINGET", "LONG_BINGET"]:
                         values.append(memo[int(ops[n - offset][1])])