From: Tim Peters <tim.peters@gmail.com>
Date: Mon, 27 Feb 2006 17:47:02 +0000 (+0000)
Subject: Merge rev 42607 from the trunk.
X-Git-Tag: v2.4.3c1~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91e742fb6bb59c5a787f4b8a2584fdab4d82dd73;p=thirdparty%2FPython%2Fcpython.git

Merge rev 42607 from the trunk.

Patch 1413181, by Gabriel Becedillas.

PyThreadState_Delete():  if the auto-GIL-state machinery knows about
the thread state, forget it (since the thread state is being deleted,
continuing to remember it can't help, but can hurt if another thread
happens to get created with the same thread id).
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 675c045b0b0b..9681782a661c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -44,6 +44,12 @@ Core and builtins
 
 - Fix segfault with invalid coding.
 
+- Patch #1413181:  changed ``PyThreadState_Delete()`` to forget about the
+  current thread state when the auto-GIL-state machinery knows about
+  it (since the thread state is being deleted, continuing to remember it
+  can't help, but can hurt if another thread happens to get created with
+  the same thread id).
+
 Extension Modules
 -----------------
 
diff --git a/Python/pystate.c b/Python/pystate.c
index 52ff1511a05e..cdb717669684 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -262,6 +262,10 @@ PyThreadState_Delete(PyThreadState *tstate)
 	if (tstate == _PyThreadState_Current)
 		Py_FatalError("PyThreadState_Delete: tstate is still current");
 	tstate_delete_common(tstate);
+#ifdef WITH_THREAD
+	if (autoTLSkey && PyThread_get_key_value(autoTLSkey) == tstate)
+		PyThread_delete_key_value(autoTLSkey);
+#endif /* WITH_THREAD */
 }