Fixed issue #4792: Prevent a segfault in _tkinter by using the

guaranteed to be safe interp argument given to the PythonCmd in place
of the Tcl interpreter taken from a PythonCmd_ClientData.

diff --git a/Misc/NEWS b/Misc/NEWS
index 0e88f1deda2f8116dc9def8c3354d6da75d062ee..1eec608cc6b0b3481868d065dcd693470b2190c2 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -168,6 +168,10 @@ Core and Builtins
 Library
 -------
 
+- Issue #4792: Prevent a segfault in _tkinter by using the
+  guaranteed to be safe interp argument given to the PythonCmd in place of
+  the Tcl interpreter taken from a PythonCmd_ClientData.
+
 - Issue #5193: Guarantee that Tkinter.Text.search returns a string.
 
 - Issue #5394: removed > 2.3 syntax from distutils.msvc9compiler.

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index d0d29ea4b719a72973d6da519b5453b5bf0963e0..4056bcd412e4d66516f13f607d1fbcbca5ac813f 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -2070,7 +2070,7 @@ PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
                return PythonCmd_Error(interp);
        }
        else {
-               Tcl_SetObjResult(Tkapp_Interp(self), obj_res);
+               Tcl_SetObjResult(interp, obj_res);
                rv = TCL_OK;
        }