From 0d5e52d3469a310001afe50689f77ddba6d554d1 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 4 May 2011 20:02:30 +0200
Subject: Issue #1856: Avoid crashes and lockups when daemon threads run while
 the interpreter is shutting down; instead, these threads are now killed when
 they try to take the GIL.

---
 Python/ceval.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Python/ceval.c')

diff --git a/Python/ceval.c b/Python/ceval.c
index 43a5c904d1..705ed415a9 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -440,6 +440,12 @@ PyEval_RestoreThread(PyThreadState *tstate)
     if (gil_created()) {
         int err = errno;
         take_gil(tstate);
+        /* _Py_Finalizing is protected by the GIL */
+        if (_Py_Finalizing && tstate != _Py_Finalizing) {
+            drop_gil(tstate);
+            PyThread_exit_thread();
+            assert(0);  /* unreachable */
+        }
         errno = err;
     }
 #endif
-- 
cgit v1.2.1