diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2013-03-22 15:55:23 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2013-03-22 15:55:23 +0000 |
| commit | 2787762f16319244dff0e05b05569a3f197605f8 (patch) | |
| tree | ddda22809ea0d562a583c9929293cd8359f483ce | |
| parent | a4c3a184c185667c1cc5e97db9b8d372b7e1f2db (diff) | |
evbuffer_readline returns allocated storage, don't leak it.
| -rw-r--r-- | usr.bin/tmux/cmd-break-pane.c | 3 | ||||
| -rw-r--r-- | usr.bin/tmux/cmd-run-shell.c | 3 | ||||
| -rw-r--r-- | usr.bin/tmux/status.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/cmd-break-pane.c b/usr.bin/tmux/cmd-break-pane.c index 715b8ce5b84..df87ad3d714 100644 --- a/usr.bin/tmux/cmd-break-pane.c +++ b/usr.bin/tmux/cmd-break-pane.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-break-pane.c,v 1.17 2012/08/14 08:51:53 nicm Exp $ */ +/* $OpenBSD: cmd-break-pane.c,v 1.18 2013/03/22 15:55:22 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -93,7 +93,6 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_ctx *ctx) server_status_session_group(s); if (args_has(args, 'P')) { - if ((template = args_get(args, 'F')) == NULL) template = BREAK_PANE_TEMPLATE; diff --git a/usr.bin/tmux/cmd-run-shell.c b/usr.bin/tmux/cmd-run-shell.c index d341258bffe..c2ea3121857 100644 --- a/usr.bin/tmux/cmd-run-shell.c +++ b/usr.bin/tmux/cmd-run-shell.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-run-shell.c,v 1.15 2013/03/22 15:49:55 nicm Exp $ */ +/* $OpenBSD: cmd-run-shell.c,v 1.16 2013/03/22 15:55:22 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -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/usr.bin/tmux/status.c b/usr.bin/tmux/status.c index 3c35ff4c54b..08c4e3395ae 100644 --- a/usr.bin/tmux/status.c +++ b/usr.bin/tmux/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.101 2013/03/22 15:52:40 nicm Exp $ */ +/* $OpenBSD: status.c,v 1.102 2013/03/22 15:55:22 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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); |