Fix from Michael Stone for SF bug #660476 and #513033 (bogus thread
state swaps in readline).
diff --git a/Misc/ACKS b/Misc/ACKS
index a9773d8..f3f5b8b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -511,6 +511,7 @@
Richard Stoakley
Casper Stoel
Peter Stoehr
+Michael Stone
Ken Stox
Daniel Stutzbach
Paul Swartz
diff --git a/Misc/NEWS b/Misc/NEWS
index e1456fe..5f3f847 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,10 @@
Extension modules
-----------------
+- Fixed broken threadstate swap in readline that could cause fatal
+ errors when a readline hook was being invoked while a background
+ thread was active. (SF bugs #660476 and #513033.)
+
- fcntl now exposes the strops.h I_* constants.
- datetime changes:
diff --git a/Modules/readline.c b/Modules/readline.c
index 972b5b2..2ae996c 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -481,16 +481,14 @@
/* C function to call the Python hooks. */
static int
-on_hook(PyObject *func, PyThreadState *tstate)
+on_hook(PyObject *func, PyThreadState **tstate)
{
int result = 0;
if (func != NULL) {
PyObject *r;
- PyThreadState *save_tstate;
/* Note that readline is called with the interpreter
lock released! */
- save_tstate = PyThreadState_Swap(NULL);
- PyEval_RestoreThread(tstate);
+ PyEval_RestoreThread(*tstate);
r = PyObject_CallFunction(func, NULL);
if (r == NULL)
goto error;
@@ -504,8 +502,7 @@
PyErr_Clear();
Py_XDECREF(r);
done:
- PyEval_SaveThread();
- PyThreadState_Swap(save_tstate);
+ *tstate = PyEval_SaveThread();
}
return result;
}
@@ -513,14 +510,14 @@
static int
on_startup_hook(void)
{
- return on_hook(startup_hook, startup_hook_tstate);
+ return on_hook(startup_hook, &startup_hook_tstate);
}
#ifdef HAVE_RL_PRE_INPUT_HOOK
static int
on_pre_input_hook(void)
{
- return on_hook(pre_input_hook, pre_input_hook_tstate);
+ return on_hook(pre_input_hook, &pre_input_hook_tstate);
}
#endif
@@ -533,10 +530,8 @@
char *result = NULL;
if (completer != NULL) {
PyObject *r;
- PyThreadState *save_tstate;
/* Note that readline is called with the interpreter
lock released! */
- save_tstate = PyThreadState_Swap(NULL);
PyEval_RestoreThread(completer_tstate);
/* Don't use the default filename completion if we
* have a custom completion function... */
@@ -559,14 +554,13 @@
PyErr_Clear();
Py_XDECREF(r);
done:
- PyEval_SaveThread();
- PyThreadState_Swap(save_tstate);
+ completer_tstate = PyEval_SaveThread();
}
return result;
}
-/* a more flexible constructor that saves the "begidx" and "endidx"
+/* A more flexible constructor that saves the "begidx" and "endidx"
* before calling the normal completer */
char **