Skip to content

gh-161388: [tkinter] Fix crash on raising __str__ method passed to setvar #161397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sobolevn merged 6 commits into from
Nov 7, 2026
+29 −2
Merged

gh-161388: [tkinter] Fix crash on raising __str__ method passed to setvar #161397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
efffb29
gh-161388: [tkinter] Fix crash on raising `__str__` method passed to …
sobolevn Nov 5, 2026
f177872
Apply suggestions from code review
sobolevn Nov 5, 2026
90eb612
Update Modules/_tkinter.c
sobolevn Nov 5, 2026
09ad219
Address review
sobolevn Nov 5, 2026
81c1b2e
Address review
sobolevn Nov 7, 2026
954283c
Address review
sobolevn Nov 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions Lib/test/test_tcl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,29 @@ def test_returning_deeply_nested(self):
% support.exceeds_recursion_limit())
self.assertRaises(RecursionError, interp.getvar, 'x')

def test_setvar_evil(self):
# gh-161388
class StrRaises:
def __str__(self):
raise RuntimeError("setvar evil")

value = StrRaises()
tk = self.interp.tk

with self.assertRaisesRegex(RuntimeError, "setvar evil"):
tk.setvar("local_name1", value)
self.assertRaises(TclError, tk.getvar, "local_name1")
with self.assertRaisesRegex(RuntimeError, "setvar evil"):
tk.setvar("local_name2", "local_name3", value)
self.assertRaises(TclError, tk.getvar, "local_name2", "local_name3")

with self.assertRaisesRegex(RuntimeError, "setvar evil"):
tk.globalsetvar("global_name1", value)
self.assertRaises(TclError, tk.globalgetvar, "global_name1")
with self.assertRaisesRegex(RuntimeError, "setvar evil"):
tk.globalsetvar("global_name2", "global_name3", value)
self.assertRaises(TclError, tk.globalgetvar, "global_name2", "global_name3")

def test_user_command(self):
result = None
def testfunc(arg):
Expand Down
8 changes: 6 additions & 2 deletions Modules/_tkinter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,8 +1234,9 @@ AsObjNested(PyObject *value, int depth)

{
PyObject *v = PyObject_Str(value);
if (!v)
return 0;
if (!v) {
return NULL;
Comment thread
sobolevn marked this conversation as resolved.
Resolved
Comment thread
sobolevn marked this conversation as resolved.
Resolved
}
result = AsObjNested(v, depth);
Py_DECREF(v);
return result;
Expand Down Expand Up @@ -2101,6 +2102,9 @@ SetVar(TkappObject *self, PyObject *args, int flags)

/* XXX must hold tcl lock already??? */
newval = AsObj(newValue);
if (newval == NULL) {
return NULL;
}
if (self->trace) {
if (flags & TCL_GLOBAL_ONLY) {
TRACE(self, ("((sssNO))", "uplevel", "#0", "set",
Expand Down
Loading