aboutsummaryrefslogtreecommitdiff
path: root/options.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-03-09 15:39:36 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-03-09 15:39:36 +0000
commit180ebf02081087eec625a25c785985f5d6b5eff4 (patch)
tree7d995692ed6007c747da0caa2b189aadfac91917 /options.c
parent514a723f7489123371bded176355ead48f338ae0 (diff)
parent92434b0afdf9cf04f1067c4e782b3132002b267a (diff)
downloadrtmux-180ebf02081087eec625a25c785985f5d6b5eff4.tar.gz
rtmux-180ebf02081087eec625a25c785985f5d6b5eff4.tar.bz2
rtmux-180ebf02081087eec625a25c785985f5d6b5eff4.zip
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'options.c')
-rw-r--r--options.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/options.c b/options.c
index 4de25937..4cd3ea10 100644
--- a/options.c
+++ b/options.c
@@ -427,6 +427,8 @@ options_match(const char *s, int *idx, int* ambiguous)
size_t namelen;
name = options_parse(s, idx);
+ if (name == NULL)
+ return (NULL);
namelen = strlen(name);
if (*name == '@') {