diff options
| author |   nicm <nicm@openbsd.org> | 2013-03-25 11:41:31 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2013-03-25 11:41:31 +0000 |
| commit | 2953790ecc9ef683d32fbc9f9bd441487fc38968 (patch) | |
| tree | 04f0a19ac2eda6c402ef3c96ac9cef75c0b33f25 /usr.bin/tmux/cmd-display-message.c | |
| parent | Only send end guard if begin was sent, from George Nachman. (diff) | |
| download | wireguard-openbsd-2953790ecc9ef683d32fbc9f9bd441487fc38968.tar.xz wireguard-openbsd-2953790ecc9ef683d32fbc9f9bd441487fc38968.zip | |
Don't let display-message crash if no client, from George Nachman.
Diffstat (limited to 'usr.bin/tmux/cmd-display-message.c')
| -rw-r--r-- | usr.bin/tmux/cmd-display-message.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/tmux/cmd-display-message.c b/usr.bin/tmux/cmd-display-message.c index f326a5c98cb..173c794df38 100644 --- a/usr.bin/tmux/cmd-display-message.c +++ b/usr.bin/tmux/cmd-display-message.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-display-message.c,v 1.20 2013/03/24 09:54:10 nicm Exp $ */ +/* $OpenBSD: cmd-display-message.c,v 1.21 2013/03/25 11:41:31 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -90,7 +90,10 @@ cmd_display_message_exec(struct cmd *self, struct cmd_q *cmdq) msg = format_expand(ft, out); if (args_has(self->args, 'p')) cmdq_print(cmdq, "%s", msg); - else + else if (c == NULL) { + cmdq_error(cmdq, "no client available"); + return (CMD_RETURN_ERROR); + } else status_message_set(c, "%s", msg); free(msg); format_free(ft); |