Changeset 6fe806a

Timestamp:

Jan 17, 2008, 2:55:22 PM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

625802a

Parents:

81312e4

Message:

better compliance with UTF-8 processing. Stop trying to pull in a UTF-8
character as soon as we know something has gone wrong.

File:

• owl.c (modified) (1 diff)

owl.c

@@ -562 +562 @@
         
         for (i = 1; i < bytes; i++) {
-          utf8buf[i] = wgetch(typwin);
-        }
-        if (g_utf8_validate(utf8buf, -1, NULL)) {
-          j.uch = g_utf8_get_char(utf8buf);
-        }
-        else {
-          j.ch = ERR;
-        }
+          int tmp =  wgetch(typwin);
+          /* If what we got was not a byte, or not a continuation byte */
+          if (tmp > 0xff || !(tmp & 0x80 && ~tmp & 0x40)) {
+            /* ill-formed UTF-8 code unit subsequence, put back the
+               char we just got. */
+            ungetch(tmp);
+            j.ch = ERR;
+            break;
+          }
+          utf8buf[i] = tmp;
+        }
+        
+        if (j.ch != ERR) {
+          if (g_utf8_validate(utf8buf, -1, NULL)) {
+            j.uch = g_utf8_get_char(utf8buf);
+          }
+          else {
+            j.ch = ERR;
+          }
+        }
       }
       else if (j.ch <= 0x7f) {