diff options
author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2017-08-29 09:18:49 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2017-08-29 09:18:49 +0000 |
commit | cda40602f91b133a818b52604234fb4658a6f5d0 (patch) | |
tree | 1faf0a40ca27a856c368d27da54b38515f22c22e /usr.bin/tmux/server-fn.c | |
parent | 14477edaa57aecddd277fb7e9bb6d488def77b08 (diff) |
Check for complete keys before escape prefix, allows keys to be defined
with a leading escape. GitHub issue 1048.
Diffstat (limited to 'usr.bin/tmux/server-fn.c')
-rw-r--r-- | usr.bin/tmux/server-fn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/server-fn.c b/usr.bin/tmux/server-fn.c index 49e8e19585b..413bae44de9 100644 --- a/usr.bin/tmux/server-fn.c +++ b/usr.bin/tmux/server-fn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-fn.c,v 1.110 2017/07/12 09:07:52 nicm Exp $ */ +/* $OpenBSD: server-fn.c,v 1.111 2017/08/29 09:18:48 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -164,7 +164,7 @@ server_lock_client(struct client *c) return; cmd = options_get_string(c->session->options, "lock-command"); - if (strlen(cmd) + 1 > MAX_IMSGSIZE - IMSG_HEADER_SIZE) + if (*cmd == '\0' || strlen(cmd) + 1 > MAX_IMSGSIZE - IMSG_HEADER_SIZE) return; tty_stop_tty(&c->tty); |