From 569e25fb0005cb2e5d40b9b58c9ad87e7e1ea8e0 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 22 May 2019 18:58:32 +0000 Subject: Fix crash if window doesn't exist, GitHub issue 1751. --- usr.bin/tmux/cmd-show-options.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'usr.bin/tmux/cmd-show-options.c') diff --git a/usr.bin/tmux/cmd-show-options.c b/usr.bin/tmux/cmd-show-options.c index 764ea399254..6a316dd2134 100644 --- a/usr.bin/tmux/cmd-show-options.c +++ b/usr.bin/tmux/cmd-show-options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-show-options.c,v 1.51 2019/05/12 18:18:30 nicm Exp $ */ +/* $OpenBSD: cmd-show-options.c,v 1.52 2019/05/22 18:58:31 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -91,7 +91,14 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item) window = (self->entry == &cmd_show_window_options_entry); if (args->argc == 0) { - options_scope_from_flags(args, window, fs, &oo, &cause); + scope = options_scope_from_flags(args, window, fs, &oo, &cause); + if (scope == OPTIONS_TABLE_NONE) { + if (args_has(args, 'q')) + return (CMD_RETURN_NORMAL); + cmdq_error(item, "%s", cause); + free(cause); + return (CMD_RETURN_ERROR); + } return (cmd_show_options_all(self, item, oo)); } argument = format_single(item, args->argv[0], c, s, wl, NULL); -- cgit v1.2.3