From 7b0a122fe4ffab31555f0bfb4903eee4b69de9f7 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Wed, 28 Mar 2012 12:49:35 -0300 Subject: [PATCH] --- yaml --- r: 298349 b: refs/heads/master c: 64c17be4ffb8d6971051aec77ca1de4cfadb166d h: refs/heads/master i: 298347: 1cd1a33a3ebf106e2fcb53c04feddf9aa2da21b5 v: v3 --- [refs] | 2 +- trunk/tools/perf/util/annotate.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 546a930b3189..bec2228aa9f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc96aa7a7f2e9a1a3cf8be3720f185f2d13fe34b +refs/heads/master: 64c17be4ffb8d6971051aec77ca1de4cfadb166d diff --git a/trunk/tools/perf/util/annotate.c b/trunk/tools/perf/util/annotate.c index 31ba2a20c0fb..199f69ec656f 100644 --- a/trunk/tools/perf/util/annotate.c +++ b/trunk/tools/perf/util/annotate.c @@ -28,8 +28,8 @@ int symbol__annotate_init(struct map *map __used, struct symbol *sym) int symbol__alloc_hist(struct symbol *sym) { struct annotation *notes = symbol__annotation(sym); - size_t sizeof_sym_hist = (sizeof(struct sym_hist) + - (sym->end - sym->start) * sizeof(u64)); + const size_t size = sym->end - sym->start + 1; + size_t sizeof_sym_hist = (sizeof(struct sym_hist) + size * sizeof(u64)); notes->src = zalloc(sizeof(*notes->src) + symbol_conf.nr_events * sizeof_sym_hist); if (notes->src == NULL) @@ -64,7 +64,7 @@ int symbol__inc_addr_samples(struct symbol *sym, struct map *map, pr_debug3("%s: addr=%#" PRIx64 "\n", __func__, map->unmap_ip(map, addr)); - if (addr >= sym->end) + if (addr > sym->end) return 0; offset = addr - sym->start;