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

Don't leak existing keys.

pull/1/head
Nicholas Marriott 2009-02-16 18:43:07 +00:00
parent 17017ef3bc
commit a766f9743a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tty-keys.c
View File

@ -1,4 +1,4 @@
/* $Id: tty-keys.c,v 1.21 2009-01-28 19:52:21 nicm Exp $ */
/* $Id: tty-keys.c,v 1.22 2009-02-16 18:43:07 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -123,7 +123,14 @@ tty_keys_cmp(struct tty_key *k1, struct tty_key *k2)
void
tty_keys_add(struct tty *tty, const char *s, int key, int flags)
{
struct tty_key *tk;
struct tty_key *tk, tl;
tl.string = s;
if ((tk = RB_FIND(tty_keys, &tty->ktree, &tl)) != NULL) {
log_debug("already key matching: %s (old %x, new %x)",
tk->string, tk->key, key);
return;
}
tk = xmalloc(sizeof *tk);
tk->string = xstrdup(s);
@ -174,10 +181,10 @@ tty_keys_init(struct tty *tty)
void
tty_keys_free(struct tty *tty)
{
struct tty_key *tk, *tl;
for (tk = RB_MIN(tty_keys, &tty->ktree); tk != NULL; tk = tl) {
tl = RB_NEXT(tty_keys, &tty->ktree, tk);
struct tty_key *tk;
while (!RB_EMPTY(&tty->ktree)) {
tk = RB_ROOT(&tty->ktree);
RB_REMOVE(tty_keys, &tty->ktree, tk);
xfree(tk->string);
xfree(tk);