lkml.org 
[lkml]   [2011]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH -tip] perf hists browser: Fix seg fault when annotate null symbol
From
Date
On Fri, 2011-04-08 at 14:31 +0800, Lin Ming wrote:
> In hists browser, press hotkey 'a' to annotate current symbol.
> Now it causes segment fault if 'a' is pressed on a null symbol.
>
> Here are 2 small bugs:
> - In perf_evsel__hists_browse, the condition check after 'a' is pressed
> is not correct, we should check ->sym instead of ->map.
> - In symbol__tui_annotate we must check whether sym is NULL or not
> before getting annotation structure.
>
> This patch fixes above 2 small bugs.

Hi, Arnaldo

Could you have a look at this segment fault fix?

Thanks,
Lin Ming

>
> Signed-off-by: Lin Ming <ming.m.lin@intel.com>
> ---
> tools/perf/util/ui/browsers/annotate.c | 6 ++++--
> tools/perf/util/ui/browsers/hists.c | 2 +-
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
> index 8c17a87..15633d6 100644
> --- a/tools/perf/util/ui/browsers/annotate.c
> +++ b/tools/perf/util/ui/browsers/annotate.c
> @@ -256,10 +256,9 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
> int refresh)
> {
> struct objdump_line *pos, *n;
> - struct annotation *notes = symbol__annotation(sym);
> + struct annotation *notes;
> struct annotate_browser browser = {
> .b = {
> - .entries = &notes->src->source,
> .refresh = ui_browser__list_head_refresh,
> .seek = ui_browser__list_head_seek,
> .write = annotate_browser__write,
> @@ -281,6 +280,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
>
> ui_helpline__push("Press <- or ESC to exit");
>
> + notes = symbol__annotation(sym);
> +
> list_for_each_entry(pos, &notes->src->source, node) {
> struct objdump_line_rb_node *rbpos;
> size_t line_len = strlen(pos->line);
> @@ -291,6 +292,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
> rbpos->idx = browser.b.nr_entries++;
> }
>
> + browser.b.entries = &notes->src->source,
> browser.b.width += 18; /* Percentage */
> ret = annotate_browser__run(&browser, evidx, refresh);
> list_for_each_entry_safe(pos, n, &notes->src->source, node) {
> diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
> index 798efdc..5d767c6 100644
> --- a/tools/perf/util/ui/browsers/hists.c
> +++ b/tools/perf/util/ui/browsers/hists.c
> @@ -851,7 +851,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel,
> goto out_free_stack;
> case 'a':
> if (browser->selection == NULL ||
> - browser->selection->map == NULL ||
> + browser->selection->sym == NULL ||
> browser->selection->map->dso->annotate_warned)
> continue;
> goto do_annotate;
>




\
 
 \ /
  Last update: 2011-04-12 09:35    [W:0.050 / U:0.156 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site