diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-11-14 11:38:52 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-11-14 11:38:52 +0000 |
| commit | 7b4b78b41943082663ba75c7dcfb4e2efa86f4c7 (patch) | |
| tree | d0e771c5dcdc91a455e06a352ca6508e7803e867 /key-string.c | |
| parent | 7b749eff3510ccf173c029a92c266e91454ce600 (diff) | |
| parent | dab63b029e94dcabe335abf7f89c66c28486a542 (diff) | |
| download | rtmux-7b4b78b41943082663ba75c7dcfb4e2efa86f4c7.tar.gz rtmux-7b4b78b41943082663ba75c7dcfb4e2efa86f4c7.tar.bz2 rtmux-7b4b78b41943082663ba75c7dcfb4e2efa86f4c7.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'key-string.c')
| -rw-r--r-- | key-string.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/key-string.c b/key-string.c index c2230218..ad7cbf50 100644 --- a/key-string.c +++ b/key-string.c @@ -144,7 +144,7 @@ key_string_lookup_string(const char *string) static const char *other = "!#()+,-.0123456789:;<=>?'\r\t"; key_code key; u_short u; - int size; + int size, more; key_code modifiers; struct utf8_data ud; u_int i; @@ -176,8 +176,11 @@ key_string_lookup_string(const char *string) if (utf8_open(&ud, (u_char)*string)) { if (strlen(string) != ud.size) return (KEYC_NONE); + more = 1; for (i = 1; i < ud.size; i++) - utf8_append(&ud, (u_char)string[i]); + more = utf8_append(&ud, (u_char)string[i]); + if (more != 0) + return (KEYC_NONE); key = utf8_combine(&ud); return (key | modifiers); } |