From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 21 Mar 2023 19:10:36 +0000 (-0700)
Subject: gh-98608: Fix Failure-handling in new_interpreter() (gh-102658)
X-Git-Tag: v3.10.11~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5fdc3f07ec64d6e17a63f995ed03f0f107cda78;p=thirdparty%2FPython%2Fcpython.git

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.

(cherry picked from commit d1b883b52a99427d234c20e4a92ddfa6a1da8880)

Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
https: //github.com/python/cpython/issues/98608
---

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index eeaf20b4617a..b0c5da56c4ff 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1962,10 +1962,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;
 }