nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Support in the cross-platform code for translating to and from

Browse Source 
UTF-16 when exchanging wchar_t strings with the front end. Enabled
by a #define in the platform's header file (one should not
promiscuously translate UTF-16 surrogate pairs on 32-bit wchar_t
platforms since that could give rise to redundant encoding attacks),
which is present on Windows.

[originally from svn r8495]
This commit is contained in:
Simon Tatham 2009-03-24 22:24:31 +00:00
parent 713df723ae
commit 87aafaa89a
3 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ldiscucs.c
View File

@ -49,19 +49,39 @@ void luni_send(void *handle, wchar_t * widebuf, int len, int interactive)
if (in_utf(ldisc->term)) { if (in_utf(ldisc->term)) {
/* UTF is a simple algorithm */ /* UTF is a simple algorithm */
for (p = linebuffer, i = 0; i < len; i++) { for (p = linebuffer, i = 0; i < len; i++) {
wchar_t ch = widebuf[i]; unsigned long ch = widebuf[i];
/* We only deal with 16-bit wide chars */
if ((ch&0xF800) == 0xD800) ch = '.'; if ((ch & 0xF800) == 0xD800) {
#ifdef PLATFORM_IS_UTF16
if (i+1 < len) {
unsigned long ch2 = widebuf[i+1];
if ((ch & 0xFC00) == 0xD800 &&
(ch2 & 0xFC00) == 0xDC00) {
ch = 0x10000 + ((ch & 0x3FF) << 10) + (ch2 & 0x3FF);
i++;
}
} else
#endif
{
/* Unrecognised UTF-16 sequence */
ch = '.';
}
}
if (ch < 0x80) { if (ch < 0x80) {
*p++ = (char) (ch); *p++ = (char) (ch);
} else if (ch < 0x800) { } else if (ch < 0x800) {
*p++ = (0xC0 | (ch >> 6)); *p++ = (0xC0 | (ch >> 6));
*p++ = (0x80 | (ch & 0x3F)); *p++ = (0x80 | (ch & 0x3F));
} else { } else if (ch < 0x10000) {
*p++ = (0xE0 | (ch >> 12)); *p++ = (0xE0 | (ch >> 12));
*p++ = (0x80 | ((ch >> 6) & 0x3F)); *p++ = (0x80 | ((ch >> 6) & 0x3F));
*p++ = (0x80 | (ch & 0x3F)); *p++ = (0x80 | (ch & 0x3F));
} else {
*p++ = (0xF0 | (ch >> 18));
*p++ = (0x80 | ((ch >> 12) & 0x3F));
*p++ = (0x80 | ((ch >> 6) & 0x3F));
*p++ = (0x80 | (ch & 0x3F));
} }
} }
} else { } else {

9
terminal.c
View File

@ -5262,8 +5262,17 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
set = (uc & CSET_MASK); set = (uc & CSET_MASK);
c = (uc & ~CSET_MASK); c = (uc & ~CSET_MASK);
#ifdef PLATFORM_IS_UTF16
if (uc > 0x10000 && uc < 0x110000) {
cbuf[0] = 0xD800 | ((uc - 0x10000) >> 10);
cbuf[1] = 0xDC00 | ((uc - 0x10000) & 0x3FF);
cbuf[2] = 0;
} else
#endif
{
cbuf[0] = uc; cbuf[0] = uc;
cbuf[1] = 0; cbuf[1] = 0;
}
if (DIRECT_FONT(uc)) { if (DIRECT_FONT(uc)) {
if (c >= ' ' && c != 0x7F) { if (c >= ' ' && c != 0x7F) {

3
windows/winstuff.h
View File

@ -36,6 +36,9 @@ struct FontSpec {
(fq) == FQ_NONANTIALIASED ? NONANTIALIASED_QUALITY : \ (fq) == FQ_NONANTIALIASED ? NONANTIALIASED_QUALITY : \
CLEARTYPE_QUALITY) CLEARTYPE_QUALITY)
#define PLATFORM_IS_UTF16 /* enable UTF-16 processing when exchanging
* wchar_t strings with environment */
/* /*
* Where we can, we use GetWindowLongPtr and friends because they're * Where we can, we use GetWindowLongPtr and friends because they're
* more useful on 64-bit platforms, but they're a relatively recent * more useful on 64-bit platforms, but they're a relatively recent