diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-10-20 14:19:28 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-10-20 14:19:28 +0000 |
| commit | 6076455115186a5c31af7fc6e6a68b41780d05d2 (patch) | |
| tree | d73950cf187ddf688dbf26faafa49d1081087c90 | |
| parent | b34ecdc1dde3c3b981bcf4fedc054676fd1df78a (diff) | |
The table could change when retrying so don't save it at start of
server_client_handle_key.
| -rw-r--r-- | usr.bin/tmux/server-client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index fdf0d378776..db7bca13575 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.155 2015/10/18 20:42:43 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.156 2015/10/20 14:19:27 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -541,7 +541,7 @@ server_client_handle_key(struct client *c, int key) struct window *w; struct window_pane *wp; struct timeval tv; - struct key_table *table = c->keytable; + struct key_table *table; struct key_binding bd_find, *bd; int xtimeout; @@ -607,7 +607,7 @@ server_client_handle_key(struct client *c, int key) retry: /* Try to see if there is a key binding in the current table. */ bd_find.key = key; - bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find); + bd = RB_FIND(key_bindings, &c->keytable->key_bindings, &bd_find); if (bd != NULL) { /* * Key was matched in this table. If currently repeating but a @@ -625,6 +625,7 @@ retry: * Take a reference to this table to make sure the key binding * doesn't disappear. */ + table = c->keytable; table->references++; /* |