Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

Conflicts:
	cmd-split-window.c
	cmd-unbind-key.c
	format.c
	osdep-openbsd.c

1 files changed, 11 insertions, 6 deletions

diff --git a/format.c b/format.c
index a7f1fdee..1e89b2d2 100644
--- a/format.c
+++ b/format.c
@@ -353,15 +353,20 @@ format_expand(struct format_tree *ft, const char *fmt)
 char *
 format_get_command(struct window_pane *wp)
 {
-	char	*cmd;
+	char	*cmd, *out;
 
 	cmd = osdep_get_name(wp->fd, wp->tty);
 	if (cmd == NULL || *cmd == '\0') {
-		cmd = wp->cmd;
-		if (cmd == NULL || *cmd == '\0')
-			cmd = wp->shell;
+		free(cmd);
+		cmd = xstrdup(wp->cmd);
+		if (cmd == NULL || *cmd == '\0') {
+			free(cmd);
+			cmd = xstrdup(wp->shell);
+		}
 	}
-	return (parse_window_name(cmd));
+	out = parse_window_name(cmd);
+	free(cmd);
+	return (out);
 }
 
 /* Set default format keys for a session. */
@@ -518,7 +523,7 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp)
 	struct grid_line	*gl;
 	unsigned long long	 size;
 	u_int			 i, idx;
-	const char		*cwd;
+	const char		*cmd;
 	char			*cmd;
 
 	size = 0;