diff options
author | Tiago Cunha <tcunha@gmx.com> | 2011-05-18 20:30:36 +0000 |
---|---|---|
committer | Tiago Cunha <tcunha@gmx.com> | 2011-05-18 20:30:36 +0000 |
commit | 1d2b487c846b7fba46e6fb8221f68d27df87b284 (patch) | |
tree | 9b651b068ae5814d7b3e05833127047c9c586e1a | |
parent | 4efd45628d28e41a1d84091b4b6091484586ca28 (diff) | |
download | rtmux-1d2b487c846b7fba46e6fb8221f68d27df87b284.tar.gz rtmux-1d2b487c846b7fba46e6fb8221f68d27df87b284.tar.bz2 rtmux-1d2b487c846b7fba46e6fb8221f68d27df87b284.zip |
Sync OpenBSD patchset 906:
Fix a memory leak if cmd_pane_session succeeds, from Tiago Cunha.
-rw-r--r-- | cmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: cmd.c,v 1.152 2011-04-06 22:29:26 nicm Exp $ */ +/* $Id: cmd.c,v 1.153 2011-05-18 20:30:36 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -713,20 +713,20 @@ cmd_find_session(struct cmd_ctx *ctx, const char *arg, int prefer_unattached) /* A NULL argument means the current session. */ if (arg == NULL) return (cmd_current_session(ctx, prefer_unattached)); - tmparg = xstrdup(arg); /* Lookup as pane id. */ if ((wp = cmd_lookup_paneid(arg)) != NULL) return (cmd_pane_session(ctx, wp, NULL)); /* Trim a single trailing colon if any. */ + tmparg = xstrdup(arg); arglen = strlen(tmparg); if (arglen != 0 && tmparg[arglen - 1] == ':') tmparg[arglen - 1] = '\0'; /* An empty session name is the current session. */ if (*tmparg == '\0') { - xfree (tmparg); + xfree(tmparg); return (cmd_current_session(ctx, prefer_unattached)); } |