commit 4e7a69bdb63a104587759d7784124492dcdd496e
author Mark Shannon <mark@hotpy.org> Wed Dec 02 13:30:55 2020 +0000
committer GitHub <noreply@github.com> Wed Dec 02 13:30:55 2020 +0000
tree 5477c7077970d9100d089286b75ce2ff408ac613
parent 93a0ef76473683aa3ad215e11df18f7839488c4e

bpo-42500: Fix recursion in or after except (GH-23568)

* Use counter, rather boolean state when handling soft overflows.

Python/errors.c

diff --git a/Python/errors.c b/Python/errors.c
index f80ae21..8242ac6 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -290,12 +290,14 @@ _PyErr_NormalizeException(PyThreadState *tstate, PyObject **exc,
                           PyObject **val, PyObject **tb)
 {
     int recursion_depth = 0;
+    tstate->recursion_headroom++;
     PyObject *type, *value, *initial_tb;
 
   restart:
     type = *exc;
     if (type == NULL) {
         /* There was no exception, so nothing to do. */
+        tstate->recursion_headroom--;
         return;
     }
 
@@ -347,6 +349,7 @@ _PyErr_NormalizeException(PyThreadState *tstate, PyObject **exc,
     }
     *exc = type;
     *val = value;
+    tstate->recursion_headroom--;
     return;
 
   error: