perf probe: Make a copy of exec path for passing to basename
authorDavid Ahern <dsahern@gmail.com>
Sat, 8 Sep 2012 15:06:51 +0000 (09:06 -0600)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 8 Sep 2012 20:15:04 +0000 (17:15 -0300)
The basename function may modify the string passed to it, so the string
should not be marked const.

Signed-off-by: David Ahern <dsahern@gmail.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Irina Tirdea <irina.tirdea@gmail.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/1347116812-93646-3-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/probe-event.c

index 0dda25d..e8c72de 100644 (file)
@@ -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);