From bcff305a813e6e6764c76be3a6e6ce186c26c612 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Mon, 28 Dec 2009 22:48:33 -0200
Subject: [PATCH] --- yaml --- r: 182335 b: refs/heads/master c:
 ae99fb2c335ef018520950ddc9692faacab39cf2 h: refs/heads/master i:   182333:
 291ba8e66de538943d219f5b557ae5afb4beba75   182331:
 962b30bbac3da1d3b7ac5bf09af8c7da7c899f71   182327:
 e656eda28ab2c4a09b97f3acb79bf1e27c7e0788   182319:
 06c185488f9cdb8b7550976b92e198a76cf91d42   182303:
 db7f0c74fa7a7a43314d9d92df4613ac66c36d97   182271:
 f85754414df4c22b85b3b5c1259241c9a270428f v: v3

---
 [refs]                               |  2 +-
 trunk/tools/perf/util/header.c       | 16 ++++++++++------
 trunk/tools/perf/util/header.h       |  2 +-
 trunk/tools/perf/util/parse-events.c | 18 +++++++++++-------
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 53e6a0f066e1..f01b2fdb4cdf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 769885f372300a7fcfb9e54e4e2990718d40b529
+refs/heads/master: ae99fb2c335ef018520950ddc9692faacab39cf2
diff --git a/trunk/tools/perf/util/header.c b/trunk/tools/perf/util/header.c
index 6b3cb94e8a2b..709e3252f049 100644
--- a/trunk/tools/perf/util/header.c
+++ b/trunk/tools/perf/util/header.c
@@ -105,24 +105,28 @@ struct perf_trace_event_type {
 static int event_count;
 static struct perf_trace_event_type *events;
 
-void perf_header__push_event(u64 id, const char *name)
+int perf_header__push_event(u64 id, const char *name)
 {
 	if (strlen(name) > MAX_EVENT_NAME)
 		pr_warning("Event %s will be truncated\n", name);
 
 	if (!events) {
 		events = malloc(sizeof(struct perf_trace_event_type));
-		if (!events)
-			die("nomem");
+		if (events == NULL)
+			return -ENOMEM;
 	} else {
-		events = realloc(events, (event_count + 1) * sizeof(struct perf_trace_event_type));
-		if (!events)
-			die("nomem");
+		struct perf_trace_event_type *nevents;
+
+		nevents = realloc(events, (event_count + 1) * sizeof(*events));
+		if (nevents == NULL)
+			return -ENOMEM;
+		events = nevents;
 	}
 	memset(&events[event_count], 0, sizeof(struct perf_trace_event_type));
 	events[event_count].event_id = id;
 	strncpy(events[event_count].name, name, MAX_EVENT_NAME - 1);
 	event_count++;
+	return 0;
 }
 
 char *perf_header__find_event(u64 id)
diff --git a/trunk/tools/perf/util/header.h b/trunk/tools/perf/util/header.h
index d118d05d3abe..2b69aab67e35 100644
--- a/trunk/tools/perf/util/header.h
+++ b/trunk/tools/perf/util/header.h
@@ -64,7 +64,7 @@ int perf_header__write(struct perf_header *self, int fd, bool at_exit);
 int perf_header__add_attr(struct perf_header *self,
 			  struct perf_header_attr *attr);
 
-void perf_header__push_event(u64 id, const char *name);
+int perf_header__push_event(u64 id, const char *name);
 char *perf_header__find_event(u64 id);
 
 struct perf_header_attr *perf_header_attr__new(struct perf_event_attr *attr);
diff --git a/trunk/tools/perf/util/parse-events.c b/trunk/tools/perf/util/parse-events.c
index dc585a835cab..609d5a9470c5 100644
--- a/trunk/tools/perf/util/parse-events.c
+++ b/trunk/tools/perf/util/parse-events.c
@@ -753,11 +753,11 @@ parse_event_symbols(const char **str, struct perf_event_attr *attr)
 	return ret;
 }
 
-static void store_event_type(const char *orgname)
+static int store_event_type(const char *orgname)
 {
 	char filename[PATH_MAX], *c;
 	FILE *file;
-	int id;
+	int id, n;
 
 	sprintf(filename, "%s/", debugfs_path);
 	strncat(filename, orgname, strlen(orgname));
@@ -769,11 +769,14 @@ static void store_event_type(const char *orgname)
 
 	file = fopen(filename, "r");
 	if (!file)
-		return;
-	if (fscanf(file, "%i", &id) < 1)
-		die("cannot store event ID");
+		return 0;
+	n = fscanf(file, "%i", &id);
 	fclose(file);
-	perf_header__push_event(id, orgname);
+	if (n < 1) {
+		pr_err("cannot store event ID\n");
+		return -EINVAL;
+	}
+	return perf_header__push_event(id, orgname);
 }
 
 int parse_events(const struct option *opt __used, const char *str, int unset __used)
@@ -782,7 +785,8 @@ int parse_events(const struct option *opt __used, const char *str, int unset __u
 	enum event_result ret;
 
 	if (strchr(str, ':'))
-		store_event_type(str);
+		if (store_event_type(str) < 0)
+			return -1;
 
 	for (;;) {
 		if (nr_counters == MAX_COUNTERS)