circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-03 16:46:18 +00:00
Code Issues Projects Releases Wiki Activity

Be more strict about invalid UTF-8.

Browse Source
This commit is contained in:
nicm
2015-11-14 10:56:31 +00:00
parent c56b81a2ce
commit 64333e3ef8
6 changed files with 76 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tty-keys.c
View File

@@ -472,7 +472,7 @@ tty_keys_next(struct tty *tty)
const char *buf;
size_t len, size;
cc_t bspace;
int delay, expired = 0;
int delay, expired = 0, more;
key_code key;
struct utf8_data ud;
u_int i;
@@ -547,7 +547,9 @@ first_key:
goto partial_key;
}
for (i = 1; i < size; i++)
utf8_append(&ud, (u_char)buf[i]);
more = utf8_append(&ud, (u_char)buf[i]);
if (more != 0)
goto discard_key;
key = utf8_combine(&ud);
log_debug("UTF-8 key %.*s %#llx", (int)size, buf, key);
goto complete_key;
@@ -653,6 +655,7 @@ tty_keys_mouse(struct tty *tty, const char *buf, size_t len, size_t *size)
struct utf8_data ud;
u_int i, value, x, y, b, sgr_b;
u_char sgr_type, c;
int more;
/*
* Standard mouse sequences are \033[M followed by three characters
@@ -699,7 +702,9 @@ tty_keys_mouse(struct tty *tty, const char *buf, size_t len, size_t *size)
(*size)++;
if (len <= *size)
return (1);
utf8_append(&ud, buf[*size]);
more = utf8_append(&ud, buf[*size]);
if (more != 0)
return (-1);
value = utf8_combine(&ud);
} else
value = (u_char)buf[*size];