From 39561f685b78e63a9797e0b76f2cfb5b58805fb7 Mon Sep 17 00:00:00 2001 From: David Ahern Date: Sat, 8 Sep 2012 09:06:51 -0600 Subject: [PATCH] --- yaml --- r: 323794 b: refs/heads/master c: 1fb89448871500e5d5e7ad93d6dae68ee4fa464a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/perf/util/probe-event.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 344daf45b66b..2497941a182c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfd14b9a7231e7cf77520bca1848c40c6b6360ae +refs/heads/master: 1fb89448871500e5d5e7ad93d6dae68ee4fa464a diff --git a/trunk/tools/perf/util/probe-event.c b/trunk/tools/perf/util/probe-event.c index 0dda25d82d06..e8c72de0f70c 100644 --- a/trunk/tools/perf/util/probe-event.c +++ b/trunk/tools/perf/util/probe-event.c @@ -2307,10 +2307,17 @@ static int convert_name_to_addr(struct perf_probe_event *pev, const char *exec) function = NULL; } if (!pev->group) { - char *ptr1, *ptr2; + char *ptr1, *ptr2, *exec_copy; pev->group = zalloc(sizeof(char *) * 64); - ptr1 = strdup(basename(exec)); + exec_copy = strdup(exec); + if (!exec_copy) { + ret = -ENOMEM; + pr_warning("Failed to copy exec string.\n"); + goto out; + } + + ptr1 = strdup(basename(exec_copy)); if (ptr1) { ptr2 = strpbrk(ptr1, "-._"); if (ptr2) @@ -2319,6 +2326,7 @@ static int convert_name_to_addr(struct perf_probe_event *pev, const char *exec) ptr1); free(ptr1); } + free(exec_copy); } free(pp->function); pp->function = zalloc(sizeof(char *) * MAX_PROBE_ARGS);