===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/names.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/tmux/names.c	2012/04/11 07:45:30	1.15
--- src/usr.bin/tmux/names.c	2012/07/10 11:53:01	1.16
***************
*** 1,4 ****
! /* $OpenBSD: names.c,v 1.15 2012/04/11 07:45:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: names.c,v 1.16 2012/07/10 11:53:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 20,25 ****
--- 20,26 ----
  
  #include <ctype.h>
  #include <libgen.h>
+ #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
  
***************
*** 73,84 ****
  			wname = parse_window_name(name + 1);
  		else
  				wname = parse_window_name(name);
! 		xfree(name);
  	}
  
  	if (w->active->fd == -1) {
  		xasprintf(&name, "%s[dead]", wname);
! 		xfree(wname);
  		wname = name;
  	}
  
--- 74,85 ----
  			wname = parse_window_name(name + 1);
  		else
  				wname = parse_window_name(name);
! 		free(name);
  	}
  
  	if (w->active->fd == -1) {
  		xasprintf(&name, "%s[dead]", wname);
! 		free(wname);
  		wname = name;
  	}
  
***************
*** 86,92 ****
  		window_set_name(w, wname);
  		server_status_window(w);
  	}
! 	xfree(wname);
  }
  
  char *
--- 87,93 ----
  		window_set_name(w, wname);
  		server_status_window(w);
  	}
! 	free(wname);
  }
  
  char *
***************
*** 122,127 ****
  	if (*name == '/')
  		name = basename(name);
  	name = xstrdup(name);
! 	xfree(copy);
  	return (name);
  }
--- 123,128 ----
  	if (*name == '/')
  		name = basename(name);
  	name = xstrdup(name);
! 	free(copy);
  	return (name);
  }