RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-27 13:49:33 +00:00
Code Issues Releases Wiki Activity

getch2: Remove unused function, fix possible crash

Browse Source 
If we still haven't read the full key from the input but it's regardless a
unique match in the database, we could receive a NULL keycode from
keys_search (it's not a full match after all) and proceed to use it.

Don't disable the keycode matching code if we don't have termcap as we can
still match against the hardcoded sequences.
This commit is contained in:
Diogo Franco (Kovensky) 2013-07-25 12:21:22 -03:00
parent 057467f6b3
commit 19b1279bb3
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
osdep/getch2.c
View File

@ -134,16 +134,6 @@ static keycode_st *keys_search(char *buf, int buflen) {
return NULL; return NULL;
} }
static keycode_st *keys_get_by_cap(char *cap) {
for (int i = 0; i < getch2_keys.len; i++) {
keycode_st *st = &getch2_keys.map[i];
if (strcmp(cap, st->cap) == 0)
return st;
}
return NULL;
}
/* pushes only if there is no duplicate. /* pushes only if there is no duplicate.
important as we only consider keys if the matches are unique. */ important as we only consider keys if the matches are unique. */
static keycode_st* keys_push_once(char *p, int code) { static keycode_st* keys_push_once(char *p, int code) {
@ -374,29 +364,33 @@ bool getch2(struct input_ctx *input_ctx)
switch (state) { switch (state) {
case STATE_INITIAL: { case STATE_INITIAL: {
#ifdef HAVE_TERMCAP
int match_count = keys_count_matches(&getch2_buf[0], getch2_len); int match_count = keys_count_matches(&getch2_buf[0], getch2_len);
if (match_count == 1) { if (match_count == 1) {
keycode_st *st = keys_search(&getch2_buf[0], getch2_len); keycode_st *st = keys_search(&getch2_buf[0], getch2_len);
mp_input_put_key(input_ctx, st->code); if (st) {
walk_buf(st->len); mp_input_put_key(input_ctx, st->code);
walk_buf(st->len);
} /* else this is still a partial (but unique) match */
continue;
} else if (match_count > 1) { } else if (match_count > 1) {
continue; /* need more bytes to disambiguate */ continue; /* need more bytes to disambiguate */
} else { } else {
#endif /* backtrack, send as UTF-8 */
utf8_len = bstr_parse_utf8_code_length(c); getch2_pos = 0;
c = getch2_buf[0];
if (utf8_len > 1) {
state = STATE_UTF8;
} else {
if (utf8_len == 1)
mp_input_put_key(input_ctx, c);
walk_buf(getch2_pos);
}
#ifdef HAVE_TERMCAP
} }
#endif utf8_len = bstr_parse_utf8_code_length(c);
if (utf8_len > 1) {
state = STATE_UTF8;
} else if (utf8_len == 1) {
mp_input_put_key(input_ctx, c);
walk_buf(1);
} else
walk_buf(getch2_pos);
break; break;
} }
case STATE_UTF8: { case STATE_UTF8: {