diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-14 07:48:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-14 07:48:13 -0700 |
| commit | bfecc60d8f6715ec6b38aa29c4f5a3570415dae0 (patch) | |
| tree | e7bc1425e0627305aa50d3370a2d72c7b75bd29b /tools/perf/util/ui/browsers/hists.c | |
| parent | 2084c24a81413b75bc97e4bee56b32ffece70460 (diff) | |
| parent | a7ca08038b990e2cbed324948664b2d8940fd782 (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf tool fixes from Ingo Molnar.
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf kvm: Finding struct machine fails for PERF_RECORD_MMAP
perf annotate: Validate addr in symbol__inc_addr_samples
perf hists browser: Fix NULL deref in hists browsing code
perf hists: Catch and handle out-of-date hist entry maps.
perf annotate: Fix hist decay
perf top: Add intel_idle to the skip list
Diffstat (limited to 'tools/perf/util/ui/browsers/hists.c')
| -rw-r--r-- | tools/perf/util/ui/browsers/hists.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c index d7a1c4afe28..2f83e5dc996 100644 --- a/tools/perf/util/ui/browsers/hists.c +++ b/tools/perf/util/ui/browsers/hists.c @@ -125,6 +125,9 @@ static int callchain__count_rows(struct rb_root *chain) static bool map_symbol__toggle_fold(struct map_symbol *self) { + if (!self) + return false; + if (!self->has_children) return false; |