aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-02-20 23:16:53 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-02-20 23:16:53 +0000
commitc577b47cd5371a95a2656e0ee9c933313121714d (patch)
treef1c2bdbe16d7a3c6a07274b6b65f9bfaacd8f6d0
parent7905f4600dd4ee0f88c4fadf1641c2afb2acc77a (diff)
parentcb6f36655efe8d7169517cc06ef6c4513a1d14d6 (diff)
downloadrtmux-c577b47cd5371a95a2656e0ee9c933313121714d.tar.gz
rtmux-c577b47cd5371a95a2656e0ee9c933313121714d.tar.bz2
rtmux-c577b47cd5371a95a2656e0ee9c933313121714d.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
-rw-r--r--cmd-run-shell.c1
-rw-r--r--status.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/cmd-run-shell.c b/cmd-run-shell.c
index 03cbc292..9b4c006a 100644
--- a/cmd-run-shell.c
+++ b/cmd-run-shell.c
@@ -112,6 +112,7 @@ cmd_run_shell_callback(struct job *job)
do {
if ((line = evbuffer_readline(job->event->input)) != NULL) {
cmd_run_shell_print (job, line);
+ free(line);
lines++;
}
} while (line != NULL);
diff --git a/status.c b/status.c
index 3a315f49..9166ea5e 100644
--- a/status.c
+++ b/status.c
@@ -676,7 +676,7 @@ status_job_callback(struct job *job)
memcpy(buf, EVBUFFER_DATA(job->event->input), len);
buf[len] = '\0';
} else
- buf = xstrdup(line);
+ buf = line;
so->out = buf;
server_status_client(c);