diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-01 11:03:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-01 11:03:25 (GMT) |
| commit | d6a967c9d8c6cc6dc8d5792070e2c2349f6ce3d8 (patch) | |
| tree | f457723f6c9c163d1c168a068b173aff785506a5 /win/tkWinFont.c | |
| parent | c1921c6eef90ee6e058c465fa2a61c2b9439454e (diff) | |
| download | tk-d6a967c9d8c6cc6dc8d5792070e2c2349f6ce3d8.zip tk-d6a967c9d8c6cc6dc8d5792070e2c2349f6ce3d8.tar.gz tk-d6a967c9d8c6cc6dc8d5792070e2c2349f6ce3d8.tar.bz2 | |
Somewhat more progress on [a179564826]: Tk 8.6: prevent issues when encountering non-BMP Unicode characters.
Increase XMaxTransChars from 4 to 7, at the same time reducing the nbytes field from int to unsigned char.
This makes more room to NULL-terminate the trans_chars array in the XEvent, even when it's 4 bytes in length.
(fully binary compatible, since the nbytes field is not supposed to be accessed externally)
Diffstat (limited to 'win/tkWinFont.c')
| -rw-r--r-- | win/tkWinFont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win/tkWinFont.c b/win/tkWinFont.c index 321ecc4..604a667 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -2225,7 +2225,7 @@ FontMapLoadPage( end = (row + 1) << FONTMAP_SHIFT; for (i = row << FONTMAP_SHIFT; i < end; i++) { if (Tcl_UtfToExternal(NULL, encoding, src, - Tcl_UniCharToUtf(i, src), TCL_ENCODING_STOPONERROR, NULL, + TkUniCharToUtf(i, src), TCL_ENCODING_STOPONERROR, NULL, buf, sizeof(buf), NULL, NULL, NULL) != TCL_OK) { continue; } |