diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2023-03-21 12:47:55 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-21 12:47:55 -0600 |
| commit | d1b883b52a99427d234c20e4a92ddfa6a1da8880 (patch) | |
| tree | 6fe066735e6e975f1f2f061ab3dc67766ceef2fa /Python/pylifecycle.c | |
| parent | 0214c7ad90b0afc3d1491c96e22e48d426caf5e2 (diff) | |
| download | cpython-d1b883b52a99427d234c20e4a92ddfa6a1da8880.tar.gz cpython-d1b883b52a99427d234c20e4a92ddfa6a1da8880.zip | |
gh-98608: Fix Failure-handling in new_interpreter() (gh-102658)
The error-handling code in new_interpreter() has been broken for a while. We hadn't noticed because those code mostly doesn't fail. (I noticed while working on gh-101660.) The problem is that we try to clear/delete the newly-created thread/interpreter using itself, which just failed. The solution is to switch back to the calling thread state first.
https://github.com/python/cpython/issues/98608
Diffstat (limited to 'Python/pylifecycle.c')
| -rw-r--r-- | Python/pylifecycle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 0d546d52087..d0e85519d23 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -2062,10 +2062,10 @@ error: /* Oops, it didn't work. Undo it all. */ PyErr_PrintEx(0); + PyThreadState_Swap(save_tstate); PyThreadState_Clear(tstate); PyThreadState_Delete(tstate); PyInterpreterState_Delete(interp); - PyThreadState_Swap(save_tstate); return status; } |