===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -c -r1.193 -r1.194
*** src/usr.bin/tmux/status.c	2019/04/23 20:36:55	1.193
--- src/usr.bin/tmux/status.c	2019/04/23 20:40:03	1.194
***************
*** 1,4 ****
! /* $OpenBSD: status.c,v 1.193 2019/04/23 20:36:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: status.c,v 1.194 2019/04/23 20:40:03 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1293,1298 ****
--- 1293,1299 ----
  	size_t					  slen = strlen(s), valuelen;
  	struct options_entry			 *o;
  	struct options_array_item		 *a;
+ 	union options_value			 *ov;
  	const char				 *layouts[] = {
  		"even-horizontal", "even-vertical", "main-horizontal",
  		"main-vertical", "tiled", NULL
***************
*** 1321,1330 ****
  	if (o != NULL) {
  		a = options_array_first(o);
  		while (a != NULL) {
! 			value = options_array_item_value(a);;
! 			if (value == NULL || (cp = strchr(value, '=')) == NULL)
  				goto next;
  
  			valuelen = cp - value;
  			if (slen > valuelen || strncmp(value, s, slen) != 0)
  				goto next;
--- 1322,1334 ----
  	if (o != NULL) {
  		a = options_array_first(o);
  		while (a != NULL) {
! 			ov = options_array_item_value(a);
! 			if (ov == NULL)
  				goto next;
  
+ 			value = ov->string;
+ 			if ((cp = strchr(value, '=')) == NULL)
+ 			    goto next;
  			valuelen = cp - value;
  			if (slen > valuelen || strncmp(value, s, slen) != 0)
  				goto next;