===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/client.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- src/usr.bin/tmux/client.c	2015/09/09 12:09:21	1.94
+++ src/usr.bin/tmux/client.c	2015/09/24 12:06:20	1.95
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.94 2015/09/09 12:09:21 nicm Exp $ */
+/* $OpenBSD: client.c,v 1.95 2015/09/24 12:06:20 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -153,15 +153,19 @@
 		}
 		fd = server_start(base, lockfd, lockfile);
 	}
+
 	if (locked) {
 		free(lockfile);
 		close(lockfd);
 	}
-
 	setblocking(fd, 0);
 	return (fd);
 
 failed:
+	if (locked) {
+		free(lockfile);
+		close(lockfd);
+	}
 	close(fd);
 	return (-1);
 }