Skip to content

Commit 32546b7

Browse files
miss-islingtonserhiy-storchakaclaude
authored
[3.13] gh-126219: Fix crash in tkinter.Tk with non-BMP className on Tcl/Tk 8.x (GH-151980) (GH-152047)
Tcl 8.x crashes when title-casing a non-BMP character during Tk initialization, so such a className is now rejected with a ValueError. (cherry picked from commit 124c7cd) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
1 parent 0ba3fcd commit 32546b7

3 files changed

Lines changed: 43 additions & 1 deletion

File tree

Lib/test/test_tkinter/test_misc.py

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
from test.support import os_helper
88
from test.test_tkinter.support import setUpModule # noqa: F401
99
from test.test_tkinter.support import (AbstractTkTest, AbstractDefaultRootTest,
10-
requires_tk, get_tk_patchlevel)
10+
requires_tk, get_tk_patchlevel,
11+
tcl_version)
1112

1213
support.requires('gui')
1314

@@ -641,6 +642,30 @@ def test_embedded_null(self):
641642
self.assertEqual(widget.selection_get(), '\u20ac\0abc\x00def')
642643

643644

645+
class TkTest(AbstractTkTest, unittest.TestCase):
646+
647+
def test_className(self):
648+
# The className argument sets the class of the root window. Tk
649+
# title-cases it: the first letter is upper-cased, the rest lower-cased.
650+
cases = [
651+
('fooBAR', 'Foobar'),
652+
('éÉ', 'Éé'), # small and capital E WITH ACUTE
653+
]
654+
if tcl_version >= (9, 0):
655+
# small and capital DESERET LETTER LONG I (a non-BMP script)
656+
cases.append(('\U00010428\U00010400', '\U00010400\U00010428'))
657+
for className, klass in cases:
658+
root = tkinter.Tk(className=className)
659+
try:
660+
self.assertEqual(root.winfo_class(), klass)
661+
finally:
662+
root.destroy()
663+
if tcl_version < (9, 0):
664+
# gh-126219: title-casing a non-BMP first letter crashed Tcl 8.x;
665+
# such a class name is now rejected.
666+
self.assertRaises(ValueError, tkinter.Tk, className='\U00010428')
667+
668+
644669
class WinfoTest(AbstractTkTest, unittest.TestCase):
645670

646671
def test_winfo_rgb(self):
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fixed a crash in :class:`tkinter.Tk` when *className* contains a non-BMP
2+
character and tkinter is built against Tcl/Tk 8.x. Such a name is now
3+
rejected with a :exc:`ValueError`.

Modules/_tkinter.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3204,6 +3204,20 @@ _tkinter_create_impl(PyObject *module, const char *screenName,
32043204
CHECK_STRING_LENGTH(className);
32053205
CHECK_STRING_LENGTH(use);
32063206

3207+
#if TCL_MAJOR_VERSION < 9
3208+
/* className is title-cased during Tk initialization. Tcl 8.x does not
3209+
* support non-BMP characters (encoded as 4-byte UTF-8 sequences) there
3210+
* and crashes in Tcl_UtfToTitle (see gh-126219). Reject them up front. */
3211+
for (const unsigned char *p = (const unsigned char *)className; *p; p++) {
3212+
if (*p >= 0xF0) {
3213+
PyErr_SetString(PyExc_ValueError,
3214+
"className must not contain non-BMP characters "
3215+
"with this version of Tcl/Tk");
3216+
return NULL;
3217+
}
3218+
}
3219+
#endif
3220+
32073221
return (PyObject *) Tkapp_New(screenName, className,
32083222
interactive, wantobjects, wantTk,
32093223
sync, use);

0 commit comments

Comments
 (0)