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.
........
This commit is contained in:
Guilherme Polo 2009-03-07 01:54:57 +00:00
parent b3c6ed5e10
commit 56f5be5317
3 changed files with 8 additions and 2 deletions

View file

@ -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;
}