---

yaml --- r: 323793 b: refs/heads/master c: bfd14b9 h: refs/heads/master i: 323791: df73df1 v: v3
git-mirror · Sep 8, 2012 · 1e62f6a · 1e62f6a
1 parent c0270b3
commit 1e62f6a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12ceaded6b276c13d905cf09f0c1a1322022ea58
+refs/heads/master: bfd14b9a7231e7cf77520bca1848c40c6b6360ae
diff --git a/trunk/tools/perf/util/annotate.c b/trunk/tools/perf/util/annotate.c
@@ -984,14 +984,19 @@ 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);
 	int printed = 2, queue_len = 0;
 	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;
 }