diff options
| author | Mark Shannon <mark@hotpy.org> | 2021-03-02 10:36:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 10:36:38 (GMT) |
| commit | 8b795ab5541d8a4e69be4137dfdc207714270b77 (patch) | |
| tree | d7fcc96f3243d082ea024964a643a32a004a5fbd /Python/sysmodule.c | |
| parent | f836e5f2194857b24ec03adfcfcce05375868f88 (diff) | |
| download | cpython-8b795ab5541d8a4e69be4137dfdc207714270b77.zip cpython-8b795ab5541d8a4e69be4137dfdc207714270b77.tar.gz cpython-8b795ab5541d8a4e69be4137dfdc207714270b77.tar.bz2 | |
bpo-42500: Fix recursion in or after except (GH-23568) (#24501)
* Use counter, rather boolean state when handling soft overflows.
(cherry picked from commit 4e7a69bdb63a104587759d7784124492dcdd496e)
Diffstat (limited to 'Python/sysmodule.c')
| -rw-r--r-- | Python/sysmodule.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 3e4115f..4c7f7b6 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1160,7 +1160,6 @@ static PyObject * sys_setrecursionlimit_impl(PyObject *module, int new_limit) /*[clinic end generated code: output=35e1c64754800ace input=b0f7a23393924af3]*/ { - int mark; PyThreadState *tstate = _PyThreadState_GET(); if (new_limit < 1) { @@ -1178,8 +1177,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. Otherwise it may not be possible anymore to reset the overflowed flag to 0. */ - mark = _Py_RecursionLimitLowerWaterMark(new_limit); - if (tstate->recursion_depth >= mark) { + if (tstate->recursion_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", |