Skip to content

Commit dbc9b68

Browse files
miss-islingtonserhiy-storchakaclaude
authored
[3.15] gh-126219: Fix crash in tkinter.Tk with non-BMP className on Tcl/Tk 8.x (GH-151980) (GH-152045)
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 4677e25 commit dbc9b68

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
@@ -8,7 +8,8 @@
88
from test.support import os_helper
99
from test.test_tkinter.support import setUpModule # noqa: F401
1010
from test.test_tkinter.support import (AbstractTkTest, AbstractDefaultRootTest,
11-
requires_tk, get_tk_patchlevel)
11+
requires_tk, get_tk_patchlevel,
12+
tcl_version)
1213

1314
support.requires('gui')
1415

@@ -667,6 +668,30 @@ def test_iterable_protocol(self):
667668
widget in widget
668669

669670

671+
class TkTest(AbstractTkTest, unittest.TestCase):
672+
673+
def test_className(self):
674+
# The className argument sets the class of the root window. Tk
675+
# title-cases it: the first letter is upper-cased, the rest lower-cased.
676+
cases = [
677+
('fooBAR', 'Foobar'),
678+
('éÉ', 'Éé'), # small and capital E WITH ACUTE
679+
]
680+
if tcl_version >= (9, 0):
681+
# small and capital DESERET LETTER LONG I (a non-BMP script)
682+
cases.append(('\U00010428\U00010400', '\U00010400\U00010428'))
683+
for className, klass in cases:
684+
root = tkinter.Tk(className=className)
685+
try:
686+
self.assertEqual(root.winfo_class(), klass)
687+
finally:
688+
root.destroy()
689+
if tcl_version < (9, 0):
690+
# gh-126219: title-casing a non-BMP first letter crashed Tcl 8.x;
691+
# such a class name is now rejected.
692+
self.assertRaises(ValueError, tkinter.Tk, className='\U00010428')
693+
694+
670695
class WinfoTest(AbstractTkTest, unittest.TestCase):
671696

672697
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
@@ -3272,6 +3272,20 @@ _tkinter_create_impl(PyObject *module, const char *screenName,
32723272
CHECK_STRING_LENGTH(className);
32733273
CHECK_STRING_LENGTH(use);
32743274

3275+
#if TCL_MAJOR_VERSION < 9
3276+
/* className is title-cased during Tk initialization. Tcl 8.x does not
3277+
* support non-BMP characters (encoded as 4-byte UTF-8 sequences) there
3278+
* and crashes in Tcl_UtfToTitle (see gh-126219). Reject them up front. */
3279+
for (const unsigned char *p = (const unsigned char *)className; *p; p++) {
3280+
if (*p >= 0xF0) {
3281+
PyErr_SetString(PyExc_ValueError,
3282+
"className must not contain non-BMP characters "
3283+
"with this version of Tcl/Tk");
3284+
return NULL;
3285+
}
3286+
}
3287+
#endif
3288+
32753289
return (PyObject *) Tkapp_New(screenName, className,
32763290
interactive, wantobjects, wantTk,
32773291
sync, use);

0 commit comments

Comments
 (0)