aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDavid Miller2012-03-25 15:28:22 -0500
committerArnaldo Carvalho de Melo2012-03-27 09:00:58 -0500
commit1e2dd2f73afdc810cc7400b7036232fbdc416eeb (patch)
tree3f525b57114571616b3fda2fe80d9a2b4709849d /tools
parent3738d40ec51317eb8390218a33513ca35656f107 (diff)
downloadkernel-omap-1e2dd2f73afdc810cc7400b7036232fbdc416eeb.tar.gz
kernel-omap-1e2dd2f73afdc810cc7400b7036232fbdc416eeb.tar.xz
kernel-omap-1e2dd2f73afdc810cc7400b7036232fbdc416eeb.zip
perf symbols: Handle NULL dso in dso__name_len
We should use "[unknown]" in this case, in concert with the code in _hist_entry__dso_snprintf(). Otherwise we'll crash when recomputing the histogram column lengths in hists__calc_col_len(). Signed-off-by: David S. Miller <davem@davemloft.net> Link: http://lkml.kernel.org/r/20120325.162822.2267799792062571623.davem@davemloft.net Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/symbol.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index d9e995bf8b6f..c0a028c3ebaf 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -50,6 +50,8 @@ struct symbol_conf symbol_conf = {
50 50
51int dso__name_len(const struct dso *dso) 51int dso__name_len(const struct dso *dso)
52{ 52{
53 if (!dso)
54 return strlen("[unknown]");
53 if (verbose) 55 if (verbose)
54 return dso->long_name_len; 56 return dso->long_name_len;
55 57