From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 3 Mar 2003 10:40:01 +0000 (+0000)
Subject: Don't crash on _tkinter.createfilehandler in non-threaded Tcl;
X-Git-Tag: v2.3c1~1613
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f13489bdfbad313774aebd8db8e8d127cb9184f;p=python

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 4e6bcbcecc..813d27c793 100644
--- 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);