From 1d2b487c846b7fba46e6fb8221f68d27df87b284 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 18 May 2011 20:30:36 +0000 Subject: [PATCH] Sync OpenBSD patchset 906: Fix a memory leak if cmd_pane_session succeeds, from Tiago Cunha. --- cmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd.c b/cmd.c index 23458af7..247910c1 100644 --- a/cmd.c +++ b/cmd.c @@ -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 @@ -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)); }