X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tools%2Fperf%2Futil%2Fheader.c;h=f6035c219b416b65556a902357088bf63f967085;hb=f8d47ca6785ce0d5998b24ec3857649fb8e6f9f5;hp=d812e1e371a743d7dcc3afd720d372f25e60ad99;hpb=cac405a3bfa21a6e17089ae2f355f34594bfb543;p=platform%2Fkernel%2Flinux-rpi.git

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index d812e1e..f6035c2 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1444,7 +1444,9 @@ static int build_mem_topology(struct memory_node **nodesp, u64 *cntp)
 			nodes = new_nodes;
 			size += 4;
 		}
-		ret = memory_node__read(&nodes[cnt++], idx);
+		ret = memory_node__read(&nodes[cnt], idx);
+		if (!ret)
+			cnt += 1;
 	}
 out:
 	closedir(dir);
@@ -4361,9 +4363,10 @@ size_t perf_event__fprintf_event_update(union perf_event *event, FILE *fp)
 		ret += fprintf(fp, "... ");
 
 		map = cpu_map__new_data(&ev->cpus.cpus);
-		if (map)
+		if (map) {
 			ret += cpu_map__fprintf(map, fp);
-		else
+			perf_cpu_map__put(map);
+		} else
 			ret += fprintf(fp, "failed to get cpus\n");
 		break;
 	default: