[tip:perf/urgent] perf symbols: Handle NULL dso in dso__name_len

From: tip-bot for David Miller
Date: Sat Mar 31 2012 - 03:43:39 EST


Commit-ID: 1e2dd2f73afdc810cc7400b7036232fbdc416eeb
Gitweb: http://git.kernel.org/tip/1e2dd2f73afdc810cc7400b7036232fbdc416eeb
Author: David Miller <davem@xxxxxxxxxxxxx>
AuthorDate: Sun, 25 Mar 2012 16:28:22 -0400
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Tue, 27 Mar 2012 11:00:58 -0300

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@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20120325.162822.2267799792062571623.davem@xxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/symbol.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index d9e995b..c0a028c 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -50,6 +50,8 @@ struct symbol_conf symbol_conf = {

int dso__name_len(const struct dso *dso)
{
+ if (!dso)
+ return strlen("[unknown]");
if (verbose)
return dso->long_name_len;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/