diff options
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Modules/readline.c | 20 |
3 files changed, 12 insertions, 13 deletions
@@ -511,6 +511,7 @@ Frank Stajano Richard Stoakley Casper Stoel Peter Stoehr +Michael Stone Ken Stox Daniel Stutzbach Paul Swartz @@ -21,6 +21,10 @@ Core and builtins 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 @@ static struct PyMethodDef readline_methods[] = /* 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 @@ on_hook(PyObject *func, PyThreadState *tstate) PyErr_Clear(); Py_XDECREF(r); done: - PyEval_SaveThread(); - PyThreadState_Swap(save_tstate); + *tstate = PyEval_SaveThread(); } return result; } @@ -513,14 +510,14 @@ on_hook(PyObject *func, PyThreadState *tstate) 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 @@ on_completion(char *text, int state) 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 @@ on_completion(char *text, int state) 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 ** |