aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/rfb/util.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/common/rfb/util.cxx b/common/rfb/util.cxx
index a3f16443..d1a8cc33 100644
--- a/common/rfb/util.cxx
+++ b/common/rfb/util.cxx
@@ -266,6 +266,8 @@ namespace rfb {
*dst++ = 0x80 | (src & 0x3f);
*dst++ = '\0';
return 2;
+ } else if ((src >= 0xd800) && (src < 0xe000)) {
+ return ucs4ToUTF8(0xfffd, dst);
} else if (src < 0x10000) {
*dst++ = 0xe0 | (src >> 12);
*dst++ = 0x80 | ((src >> 6) & 0x3f);
@@ -334,6 +336,10 @@ namespace rfb {
max--;
}
+ // UTF-16 surrogate code point?
+ if ((*dst >= 0xd800) && (*dst < 0xe000))
+ *dst = 0xfffd;
+
return consumed;
}