diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-02-20 23:16:53 +0000 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-02-20 23:16:53 +0000 |
commit | c577b47cd5371a95a2656e0ee9c933313121714d (patch) | |
tree | f1c2bdbe16d7a3c6a07274b6b65f9bfaacd8f6d0 | |
parent | 7905f4600dd4ee0f88c4fadf1641c2afb2acc77a (diff) | |
parent | cb6f36655efe8d7169517cc06ef6c4513a1d14d6 (diff) | |
download | rtmux-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.c | 1 | ||||
-rw-r--r-- | status.c | 2 |
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); @@ -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); |