summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2019-06-08 21:48:29 +0000
committernicm <nicm@openbsd.org>2019-06-08 21:48:29 +0000
commit7ff13e4a9b3d5dc37fb7e74a0806b45ff5e5d942 (patch)
tree1fc67531978c3481102539c90a47245049c06411
parentinclude mount_nfs on the amd64 ramdisk_cd, ok jca deraadt (diff)
downloadwireguard-openbsd-7ff13e4a9b3d5dc37fb7e74a0806b45ff5e5d942.tar.xz
wireguard-openbsd-7ff13e4a9b3d5dc37fb7e74a0806b45ff5e5d942.zip
Do not try to parse command when unsetting, GitHub issue 1788.
-rw-r--r--usr.bin/tmux/options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/options.c b/usr.bin/tmux/options.c
index b1031470045..65da7a7821b 100644
--- a/usr.bin/tmux/options.c
+++ b/usr.bin/tmux/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.47 2019/05/30 20:54:03 nicm Exp $ */
+/* $OpenBSD: options.c,v 1.48 2019/06/08 21:48:29 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -361,7 +361,7 @@ options_array_set(struct options_entry *o, u_int idx, const char *value,
return (-1);
}
- if (OPTIONS_IS_COMMAND(o)) {
+ if (OPTIONS_IS_COMMAND(o) && value != NULL) {
pr = cmd_parse_from_string(value, NULL);
switch (pr->status) {
case CMD_PARSE_EMPTY: