Commit ffe10c6f authored Oct 15, 2012 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Oct 16, 2012

perf tools: Fix segfault when using srcline sort key



The srcline sort key is for grouping samples based on their source file
and line number.  It use addr2line tool to get the information but it
requires dso name.  It caused a segfault when a sample does not have the
name by dereferencing a NULL pointer.  Fix it by using raw ip addresses
for those samples.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1350272383-7016-1-git-send-email-namhyung@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 20b279dd

tools/perf/util/sort.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -260,6 +260,9 @@ static int hist_entry__srcline_snprintf(struct hist_entry self, char bf,
		if (path != NULL)
		goto out_path;

		if (!self->ms.map)
		goto out_ip;

		snprintf(cmd, sizeof(cmd), "addr2line -e %s %016" PRIx64,
		self->ms.map->dso->long_name, self->ip);
		fp = popen(cmd, "r");