===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -c -r1.38 -r1.39
*** src/usr.bin/tmux/format.c	2013/10/11 08:01:29	1.38
--- src/usr.bin/tmux/format.c	2013/10/11 08:03:43	1.39
***************
*** 1,4 ****
! /* $OpenBSD: format.c,v 1.38 2013/10/11 08:01:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: format.c,v 1.39 2013/10/11 08:03:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 357,365 ****
  
  	cmd = get_proc_name(wp->fd, wp->tty);
  	if (cmd == NULL || *cmd == '\0') {
  		cmd = xstrdup(wp->cmd);
! 		if (cmd == NULL || *cmd == '\0')
  			cmd = xstrdup(wp->shell);
  	}
  	out = parse_window_name(cmd);
  	free(cmd);
--- 357,368 ----
  
  	cmd = get_proc_name(wp->fd, wp->tty);
  	if (cmd == NULL || *cmd == '\0') {
+ 		free(cmd);
  		cmd = xstrdup(wp->cmd);
! 		if (cmd == NULL || *cmd == '\0') {
! 			free(cmd);
  			cmd = xstrdup(wp->shell);
+ 		}
  	}
  	out = parse_window_name(cmd);
  	free(cmd);