diff options
| author | Guilherme Polo <ggpolo@gmail.com> | 2009-03-07 01:54:57 +0000 |
|---|---|---|
| committer | Guilherme Polo <ggpolo@gmail.com> | 2009-03-07 01:54:57 +0000 |
| commit | 81b9490ab1f472796874482949e976543100989d (patch) | |
| tree | 0b8e6acfd47bbb480eaa4859e4ab1d0abd10eb5b /Modules/_tkinter.c | |
| parent | 8031b8eee7a8bfcadbe2b1e6b181c1799341d569 (diff) | |
| download | cpython-81b9490ab1f472796874482949e976543100989d.tar.gz | |
Merged revisions 70218-70219 via svnmerge from
svn+ssh://pythondev/python/trunk
........
r70218 | guilherme.polo | 2009-03-06 22:19:12 -0300 (Fri, 06 Mar 2009) | 1 line
Fixed issue #5193: Guarantee that Tkinter.Text.search returns a string.
........
r70219 | guilherme.polo | 2009-03-06 22:47:49 -0300 (Fri, 06 Mar 2009) | 4 lines
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.
........
Diffstat (limited to 'Modules/_tkinter.c')
| -rw-r--r-- | Modules/_tkinter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index bc5523cbdb..9e7f374757 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -2026,7 +2026,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; } |