===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/options.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -c -r1.32 -r1.33
*** src/usr.bin/tmux/options.c	2017/01/30 21:41:17	1.32
--- src/usr.bin/tmux/options.c	2017/03/08 14:43:40	1.33
***************
*** 1,4 ****
! /* $OpenBSD: options.c,v 1.32 2017/01/30 21:41:17 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: options.c,v 1.33 2017/03/08 14:43:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 427,432 ****
--- 427,434 ----
  	size_t					 namelen;
  
  	name = options_parse(s, idx);
+ 	if (name == NULL)
+ 		return (NULL);
  	namelen = strlen(name);
  
  	if (*name == '@') {