summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilherme Polo <ggpolo@gmail.com>2009-03-07 01:47:49 (GMT)
committerGuilherme Polo <ggpolo@gmail.com>2009-03-07 01:47:49 (GMT)
commit3768b2f4ce6660485399425aa09fbf6381900259 (patch)
treee387827b45260d8598ae5ec325a4f1384f4864c4
parent6d6c1fd04e2d7c8edd945c826b69da41e592db4c (diff)
downloadcpython-3768b2f4ce6660485399425aa09fbf6381900259.zip
cpython-3768b2f4ce6660485399425aa09fbf6381900259.tar.gz
cpython-3768b2f4ce6660485399425aa09fbf6381900259.tar.bz2
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.
-rw-r--r--Misc/NEWS4
-rw-r--r--Modules/_tkinter.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 0e88f1d..1eec608 100644
--- 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 d0d29ea..4056bcd 100644
--- 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;
}