python · serhiy-storchaka · Apr 25, 2021 · serhiy-storchaka · Apr 25, 2021 · serhiy-storchaka
diff --git a/Python/ast.c b/Python/ast.c
diff --git a/Python/ast.c b/Python/ast.c
+
+    /* Check that the recursion depth counting balanced correctly */
+    if (res && state.recursion_depth != starting_recursion_depth) {
+        PyErr_Format(PyExc_SystemError,
+            "AST validator recursion depth mismatch (before=%d, after=%d)",
+            starting_recursion_depth, state.recursion_depth);
+        return 0;
+    }
diff --git a/Include/compile.h b/Include/compile.h
@@ -87,6 +87,9 @@ PyAPI_FUNC(int) PyCompile_OpcodeStackEffectWithJump(int opcode, int oparg, int j
 typedef struct {
    int optimize;
    int ff_features;
+
+    int recursion_depth;            /* current recursion depth */
+    int recursion_limit;            /* recursion limit */
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py

        check_limit("a", "()")
        check_limit("a", ".b")
        check_limit("a", "[0]")
        check_limit("a", "*a")
+        #check_limit("if a: pass", "\nelif a: pass", mode="exec")
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-12-12-14-28-31.bpo-42609.Qcd54b.rst b/Misc/NEWS.d/next/Core and Builtins/2020-12-12-14-28-31.bpo-42609.Qcd54b.rst
@@ -0,0 +1,3 @@
+Prevented crashes in the AST validator and optimizer when compile some
diff --git a/Python/ast_opt.c b/Python/ast_opt.c
+    starting_recursion_depth = (tstate->recursion_depth < INT_MAX / COMPILER_STACK_FRAME_SCALE) ?
+        tstate->recursion_depth * COMPILER_STACK_FRAME_SCALE : tstate->recursion_depth;
+    state->recursion_depth = starting_recursion_depth;
+    state->recursion_limit = (recursion_limit < INT_MAX / COMPILER_STACK_FRAME_SCALE) ?
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
+                details = "Compiling ({!r} + {!r} * {})".format(
+                            prefix, repeated, depth)
diff --git a/Include/compile.h b/Include/compile.h
+    int recursion_depth;            /* current recursion depth */
+    int recursion_limit;            /* recursion limit */
diff --git a/Include/compile.h b/Include/compile.h
@@ -87,6 +87,9 @@ PyAPI_FUNC(int) PyCompile_OpcodeStackEffectWithJump(int opcode, int oparg, int j
 typedef struct {
    int optimize;
    int ff_features;
+
-
diff --git a/Python/ast_opt.c b/Python/ast_opt.c
+    PyThreadState *tstate;
+    int recursion_limit = Py_GetRecursionLimit();
+    int starting_recursion_depth;
		@@ -0,0 +1,3 @@
		Prevented crashes in the AST validator and optimizer when compile some
		details = "Compiling ({!r} + {!r} * {})".format(
		prefix, repeated, depth)
		int recursion_depth; /* current recursion depth */
		int recursion_limit; /* recursion limit */