circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix 0x Unicode character parsing, GitHub issue 2286.

pull/2288/head
nicm 2020-06-27 10:19:59 +00:00
parent f69bdda950
commit 74df7071ad
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
key-string.c
View File

@ -18,7 +18,9 @@
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
#include "tmux.h"
@ -163,13 +165,13 @@ key_code
key_string_lookup_string(const char *string)
{
static const char *other = "!#()+,-.0123456789:;<=>'\r\t";
key_code key;
u_int u;
key_code modifiers;
struct utf8_data ud;
u_int i;
key_code key, modifiers;
u_int u, i;
struct utf8_data ud, *udp;
enum utf8_state more;
utf8_char uc;
char m[MB_LEN_MAX + 1];
int mlen;
/* Is this no key or any key? */
if (strcasecmp(string, "None") == 0)
@ -181,9 +183,21 @@ key_string_lookup_string(const char *string)
if (string[0] == '0' && string[1] == 'x') {
if (sscanf(string + 2, "%x", &u) != 1)
return (KEYC_UNKNOWN);
if (u > 0x1fffff)
return (KEYC_UNKNOWN);
return (u);
mlen = wctomb(m, u);
if (mlen <= 0 || mlen > MB_LEN_MAX)
return (KEYC_UNKNOWN);
m[mlen] = '\0';
udp = utf8_fromcstr(m);
if (udp == NULL ||
udp[0].size == 0 ||
udp[1].size != 0 ||
utf8_from_data(&udp[0], &uc) != UTF8_DONE) {
free(udp);
return (KEYC_UNKNOWN);
}
free(udp);
return (uc);
}
/* Check for modifiers. */