Merge pull request from GHSA-v3vh-7qx4-f582

(cherry picked from commit 4b36724)
frappe · Dec 11, 2023 · fc8d798 · fc8d798
1 parent c2daee6
commit fc8d798
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py
@@ -122,9 +122,16 @@ def _validate_safe_eval_syntax(code):
 
 @contextmanager
 def safe_exec_flags():
-	frappe.flags.in_safe_exec = True
-	yield
-	frappe.flags.in_safe_exec = False
+	if not frappe.flags.in_safe_exec:
+		frappe.flags.in_safe_exec = 0
+
+	frappe.flags.in_safe_exec += 1
+
+	try:
+		yield
+	finally:
+		# Always ensure that the flag is decremented
+		frappe.flags.in_safe_exec -= 1
 
 
 def get_safe_globals():