[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <CADu=CFrNXPJV-DiMT0Ruw6jZNhbsqg+uwP6UQnu-xrAVMc7mQg@mail.gmail.com>
Date: Wed, 5 Sep 2012 21:48:54 +0800
From: liang xie <xieliang007@...il.com>
To: acme@...stprotocols.net, mingo@...e.hu
Cc: paulus@...ba.org, linux-perf-users@...r.kernel.org,
a.p.zijlstra@...llo.nl, linux-kernel@...r.kernel.org
Subject: [PATCH] perf tool: fix trivial memory leak while calling system_path()
A trivial memory leak fix while calling system_path
Signed-off-by: Liang Xie <xieliang@...omi.com>
---
tools/perf/util/exec_cmd.c | 6 ++++--
tools/perf/util/help.c | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/exec_cmd.c b/tools/perf/util/exec_cmd.c
index 7adf4ad..790cc95 100644
--- a/tools/perf/util/exec_cmd.c
+++ b/tools/perf/util/exec_cmd.c
@@ -83,8 +83,8 @@ void setup_path(void)
{
const char *old_path = getenv("PATH");
struct strbuf new_path = STRBUF_INIT;
-
- add_path(&new_path, perf_exec_path());
+ const char *exec_path = perf_exec_path();
+ add_path(&new_path, exec_path);
add_path(&new_path, argv0_path);
if (old_path)
@@ -95,6 +95,8 @@ void setup_path(void)
setenv("PATH", new_path.buf, 1);
strbuf_release(&new_path);
+ if (exec_path)
+ free((void *)exec_path);
}
static const char **prepare_perf_cmd(const char **argv)
diff --git a/tools/perf/util/help.c b/tools/perf/util/help.c
index 6f2975a..798f66d 100644
--- a/tools/perf/util/help.c
+++ b/tools/perf/util/help.c
@@ -187,6 +187,7 @@ void load_command_list(const char *prefix,
uniq(other_cmds);
}
exclude_cmds(other_cmds, main_cmds);
+ free((void *)exec_path);
}
void list_commands(const char *title, struct cmdnames *main_cmds,
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists