]> Pileus Git - ~andy/linux/commitdiff
perf annotate: Make a copy of filename for passing to basename
authorDavid Ahern <dsahern@gmail.com>
Sat, 8 Sep 2012 15:06:50 +0000 (09:06 -0600)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 8 Sep 2012 20:14:43 +0000 (17:14 -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>
Link: http://lkml.kernel.org/r/1347116812-93646-2-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/annotate.c

index 51ef69c9841dd076777326d9d01c5b5ae71f8335..04eafd3939df6b138cfade7c51435c60d94ff4f7 100644 (file)
@@ -984,7 +984,8 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx,
                            int context)
 {
        struct dso *dso = map->dso;
-       const char *filename = dso->long_name, *d_filename;
+       char *filename;
+       const char *d_filename;
        struct annotation *notes = symbol__annotation(sym);
        struct disasm_line *pos, *queue = NULL;
        u64 start = map__rip_2objdump(map, sym->start);
@@ -992,6 +993,10 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx,
        int more = 0;
        u64 len;
 
+       filename = strdup(dso->long_name);
+       if (!filename)
+               return -ENOMEM;
+
        if (full_paths)
                d_filename = filename;
        else
@@ -1042,6 +1047,8 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx,
                }
        }
 
+       free(filename);
+
        return more;
 }