summaryrefslogtreecommitdiffstats
path: root/unix/tkUnixSelect.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-17 08:25:55 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-17 08:25:55 (GMT)
commit862f1a276482cc4ca6bf3d1f03709ab1e270c349 (patch)
tree2747bb16f7e192e364d16715fd36c74cdfb3bb06 /unix/tkUnixSelect.c
parent487b808fa7ad1096e9ee4112a719c8ed3cd45ff8 (diff)
parent932a496abd3c78e24e4723792850205193d43f4d (diff)
downloadtk-862f1a276482cc4ca6bf3d1f03709ab1e270c349.zip
tk-862f1a276482cc4ca6bf3d1f03709ab1e270c349.tar.gz
tk-862f1a276482cc4ca6bf3d1f03709ab1e270c349.tar.bz2
Fix [a179564826] for Windows/UNIX: It is now possible to display Emoji on Windows/UNIX (characters below /U30000), when compiled against the tip of core-8-6-branch.
On Mac, more work is required, so not closing this ticket yet.
Diffstat (limited to 'unix/tkUnixSelect.c')
-rw-r--r--unix/tkUnixSelect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/tkUnixSelect.c b/unix/tkUnixSelect.c
index dfbb895..4819183 100644
--- a/unix/tkUnixSelect.c
+++ b/unix/tkUnixSelect.c
@@ -21,7 +21,7 @@ typedef struct ConvertInfo {
* offset of the next chunk of data to
* transfer. */
Tcl_EncodingState state; /* The encoding state needed across chunks. */
- char buffer[TCL_UTF_MAX]; /* A buffer to hold part of a UTF character
+ char buffer[4]; /* A buffer to hold part of a UTF character
* that is split across chunks.*/
} ConvertInfo;
@@ -446,7 +446,7 @@ TkSelPropProc(
* Preserve any left-over bytes.
*/
- if (srcLen > TCL_UTF_MAX) {
+ if (srcLen > 3) {
Tcl_Panic("selection conversion left too many bytes unconverted");
}
memcpy(incrPtr->converts[i].buffer, src, (size_t) srcLen+1);