diff options
| -rw-r--r-- | Lib/tkinter/__init__.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 6 | ||||
| -rw-r--r-- | Modules/_tkinter.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index 3d519ed..b84bdf0 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -3030,7 +3030,7 @@ class Text(Widget): args.append(pattern) args.append(index) if stopindex: args.append(stopindex) - return self.tk.call(tuple(args)) + return str(self.tk.call(tuple(args))) def see(self, index): """Scroll such that the character at INDEX is visible.""" self.tk.call(self._w, 'see', index) @@ -183,6 +183,12 @@ 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. Original patch by Akira Kitada. diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index bc5523c..9e7f374 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; } |