===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -c -r1.104 -r1.105
*** src/usr.bin/tmux/server.c	2012/04/11 06:16:14	1.104
--- src/usr.bin/tmux/server.c	2012/07/10 11:53:01	1.105
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.104 2012/04/11 06:16:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.105 2012/07/10 11:53:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 162,168 ****
  	server_client_create(pair[1]);
  
  	unlink(lockfile);
! 	xfree(lockfile);
  	close(lockfd);
  
  	if (access(SYSTEM_CFG, R_OK) == 0)
--- 162,168 ----
  	server_client_create(pair[1]);
  
  	unlink(lockfile);
! 	free(lockfile);
  	close(lockfd);
  
  	if (access(SYSTEM_CFG, R_OK) == 0)
***************
*** 185,191 ****
  		for (i = 0; i < ARRAY_LENGTH(&cfg_causes); i++) {
  			cause = ARRAY_ITEM(&cfg_causes, i);
  			window_copy_add(wp, "%s", cause);
! 			xfree(cause);
  		}
  		ARRAY_FREE(&cfg_causes);
  	}
--- 185,191 ----
  		for (i = 0; i < ARRAY_LENGTH(&cfg_causes); i++) {
  			cause = ARRAY_ITEM(&cfg_causes, i);
  			window_copy_add(wp, "%s", cause);
! 			free(cause);
  		}
  		ARRAY_FREE(&cfg_causes);
  	}
***************
*** 275,282 ****
  		next_s = RB_NEXT(sessions, &dead_sessions, s);
  		if (s->references == 0) {
  			RB_REMOVE(sessions, &dead_sessions, s);
! 			xfree(s->name);
! 			xfree(s);
  		}
  		s = next_s;
  	}
--- 275,282 ----
  		next_s = RB_NEXT(sessions, &dead_sessions, s);
  		if (s->references == 0) {
  			RB_REMOVE(sessions, &dead_sessions, s);
! 			free(s->name);
! 			free(s);
  		}
  		s = next_s;
  	}
***************
*** 286,292 ****
  		if (c == NULL || c->references != 0)
  			continue;
  		ARRAY_SET(&dead_clients, i, NULL);
! 		xfree(c);
  	}
  }
  
--- 286,292 ----
  		if (c == NULL || c->references != 0)
  			continue;
  		ARRAY_SET(&dead_clients, i, NULL);
! 		free(c);
  	}
  }