Fix off-by-one error.

markshannon · markshannon · commit 86f296015c64 · 2021-11-15T12:13:38.000Z
diff --git a/Python/symtable.c b/Python/symtable.c
@@ -1,7 +1,6 @@
 #include "Python.h"
 #include "pycore_ast.h"           // identifier, stmt_ty
 #include "pycore_compile.h"       // _Py_Mangle(), _PyFuture_FromAST()
-#include "pycore_interp.h"        // recursion limit
 #include "pycore_parser.h"        // _PyParser_ASTFromString()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_symtable.h"      // PySTEntryObject
@@ -299,7 +298,7 @@ _PySymtable_Build(mod_ty mod, PyObject *filename, PyFutureFeatures *future)
         return NULL;
     }
     /* Be careful here to prevent overflow. */
-    int recursion_depth = tstate->interp->ceval.recursion_limit - tstate->recursion_remaining;
+    int recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
     starting_recursion_depth = (recursion_depth < INT_MAX / COMPILER_STACK_FRAME_SCALE) ?
         recursion_depth * COMPILER_STACK_FRAME_SCALE : recursion_depth;
     st->recursion_depth = starting_recursion_depth;
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -1190,7 +1190,7 @@ sys_setrecursionlimit_impl(PyObject *module, int new_limit)
     /* Reject too low new limit if the current recursion depth is higher than
        the new low-water mark. */
     int depth = tstate->recursion_limit - tstate->recursion_remaining;
-    if (depth > new_limit) {
+    if (depth >= new_limit) {
         _PyErr_Format(tstate, PyExc_RecursionError,
                       "cannot set the recursion limit to %i at "
                       "the recursion depth %i: the limit is too low",
