Sebastian Kuschel reports that pfd_closing can be called for a socket

[u/mdw/putty] / ldiscucs.c

diff --git a/ldiscucs.c b/ldiscucs.c
index 2160266..fe0da8a 100644 (file)
--- a/ldiscucs.c
+++ b/ldiscucs.c
@@ -26,7 +26,7 @@ void lpage_send(void *handle,
     }
 
     widesize = len * 2;
-    widebuffer = smalloc(widesize * sizeof(wchar_t));
+    widebuffer = snewn(widesize, wchar_t);
 
     wclen = mb_to_wc(codepage, 0, buf, len, widebuffer, widesize);
     luni_send(ldisc, widebuffer, wclen, interactive);
@@ -44,24 +44,43 @@ void luni_send(void *handle, wchar_t * widebuf, int len, int interactive)
     char *p;
 
     linesize = len * ratio * 2;
-    linebuffer = smalloc(linesize * sizeof(wchar_t));
+    linebuffer = snewn(linesize, char);
 
     if (in_utf(ldisc->term)) {
        /* UTF is a simple algorithm */
        for (p = linebuffer, i = 0; i < len; i++) {
-           wchar_t ch = widebuf[i];
-           /* We only deal with 16-bit wide chars */
-           if ((ch&0xF800) == 0xD800) ch = '.';
+           unsigned long ch = widebuf[i];
+
+           if (IS_SURROGATE(ch)) {
+#ifdef PLATFORM_IS_UTF16
+               if (i+1 < len) {
+                   unsigned long ch2 = widebuf[i+1];
+                   if (IS_SURROGATE_PAIR(ch, ch2)) {
+                       ch = FROM_SURROGATES(ch, ch2);
+                       i++;
+                   }
+               } else
+#endif
+               {
+                   /* Unrecognised UTF-16 sequence */
+                   ch = '.';
+               }
+           }
 
            if (ch < 0x80) {
                *p++ = (char) (ch);
            } else if (ch < 0x800) {
-               *p++ = (0xC0 | (ch >> 6));
-               *p++ = (0x80 | (ch & 0x3F));
+               *p++ = (char) (0xC0 | (ch >> 6));
+               *p++ = (char) (0x80 | (ch & 0x3F));
+           } else if (ch < 0x10000) {
+               *p++ = (char) (0xE0 | (ch >> 12));
+               *p++ = (char) (0x80 | ((ch >> 6) & 0x3F));
+               *p++ = (char) (0x80 | (ch & 0x3F));
            } else {
-               *p++ = (0xE0 | (ch >> 12));
-               *p++ = (0x80 | ((ch >> 6) & 0x3F));
-               *p++ = (0x80 | (ch & 0x3F));
+               *p++ = (char) (0xF0 | (ch >> 18));
+               *p++ = (char) (0x80 | ((ch >> 12) & 0x3F));
+               *p++ = (char) (0x80 | ((ch >> 6) & 0x3F));
+               *p++ = (char) (0x80 | (ch & 0x3F));
            }
        }
     } else {