[Python-checkins] r70219 - in python/trunk: Misc/NEWS Modules/_tkinter.c

[guilherme.polo]

Author: guilherme.polo
Date: Sat Mar  7 02:47:49 2009
New Revision: 70219

Log:
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.


Modified:
   python/trunk/Misc/NEWS
   python/trunk/Modules/_tkinter.c

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sat Mar  7 02:47:49 2009
@@ -168,6 +168,10 @@
 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.

Modified: python/trunk/Modules/_tkinter.c
==============================================================================
--- python/trunk/Modules/_tkinter.c	(original)
+++ python/trunk/Modules/_tkinter.c	Sat Mar  7 02:47:49 2009
@@ -2070,7 +2070,7 @@
 		return PythonCmd_Error(interp);
 	}
 	else {
-		Tcl_SetObjResult(Tkapp_Interp(self), obj_res);
+		Tcl_SetObjResult(interp, obj_res);
 		rv = TCL_OK;
 	}