Commit 75d9ef17 authored May 27, 2010 by Konstantin Stepanyuk Committed by Arnaldo Carvalho de Melo Jun 01, 2010

perf hist: fix objdump output parsing

hist_entry__annotate() runs objdump with -S option so the output may contain
lines of any format. If a line starts with a colon strtoull() returns 0 and
calculated offset will be negative. This causes perf annotate segfaults.

Make sure that strtoull() has parsed at least one digit.

Cc: David S. Miller <davem@davemloft.net>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Konstantin Stepanyuk <konstantin.stepanyuk@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 546cf44a

tools/perf/util/hist.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -965,7 +965,7 @@ static int hist_entry__parse_objdump_line(struct hist_entry self, FILE file,
		* Parse hexa addresses followed by ':'
		*/
		line_ip = strtoull(tmp, &tmp2, 16);
		if (*tmp2 != ':')
		if (*tmp2 != ':' \|\| tmp == tmp2)
		line_ip = -1;
		}

Admin message