Don't crash on _tkinter.createfilehandler in non-threaded Tcl;

disable this function in threaded Tcl. Likewise for creaetetimerhandler.
Fixes #692416.

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 4e6bcbceccf5fffc8818f5157614164e0f3707e3..813d27c793e6b9501821552692774275f0b93033 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -2202,7 +2202,19 @@ Tkapp_CreateFileHandler(PyObject *self, PyObject *args)
        if (!PyArg_ParseTuple(args, "OiO:createfilehandler",
                              &file, &mask, &func))
                return NULL;
-       CHECK_TCL_APPARTMENT;
+
+       if (!self && !tcl_lock) {
+               /* We don't have the Tcl lock since Tcl is threaded. */
+               PyErr_SetString(PyExc_RuntimeError,
+                               "_tkinter.createfilehandler not supported "
+                               "for threaded Tcl");
+               return NULL;
+       }
+
+       if (self) {
+               CHECK_TCL_APPARTMENT;
+       }
+
        tfile = PyObject_AsFileDescriptor(file);
        if (tfile < 0)
                return NULL;
@@ -2396,6 +2408,19 @@ Tkapp_CreateTimerHandler(PyObject *self, PyObject *args)
                PyErr_SetString(PyExc_TypeError, "bad argument list");
                return NULL;
        }
+
+       if (!self && !tcl_lock) {
+               /* We don't have the Tcl lock since Tcl is threaded. */
+               PyErr_SetString(PyExc_RuntimeError,
+                               "_tkinter.createtimerhandler not supported "
+                               "for threaded Tcl");
+               return NULL;
+       }
+
+       if (self) {
+               CHECK_TCL_APPARTMENT;
+       }
+
        v = Tktt_New(func);
        v->token = Tcl_CreateTimerHandler(milliseconds, TimerHandler,
                                          (ClientData)v);