aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2015-10-17 18:48:45 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2015-10-17 18:48:45 +0100
commit0273d809d0fd087919b61fa90b44f7f3e4f754bf (patch)
tree2213bdbf82d6a15bcb81b6ceb08d0be15b9b3349
parente0527d773144fef667addb5b4f24045c7d8aaa99 (diff)
parenta204595e4cd8a23a51fdeca08ba26e318900b494 (diff)
downloadrtmux-0273d809d0fd087919b61fa90b44f7f3e4f754bf.tar.gz
rtmux-0273d809d0fd087919b61fa90b44f7f3e4f754bf.tar.bz2
rtmux-0273d809d0fd087919b61fa90b44f7f3e4f754bf.zip
Merge branch 'master' of github.com:tmux/tmux
-rw-r--r--cmd-capture-pane.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c
index bd9ecebb..8958a12d 100644
--- a/cmd-capture-pane.c
+++ b/cmd-capture-pane.c
@@ -200,11 +200,11 @@ cmd_capture_pane_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_ERROR);
}
evbuffer_add(c->stdout_data, buf, len);
+ free(buf);
if (args_has(args, 'P') && len > 0)
evbuffer_add(c->stdout_data, "\n", 1);
server_push_stdout(c);
} else {
-
bufname = NULL;
if (args_has(args, 'b'))
bufname = args_get(args, 'b');
@@ -217,6 +217,5 @@ cmd_capture_pane_exec(struct cmd *self, struct cmd_q *cmdq)
}
}
- free(buf);
return (CMD_RETURN_NORMAL);
}