---

yaml --- r: 263181 b: refs/heads/master c: 777d1d7 h: refs/heads/master i: 263179: 73d57a4 v: v3
git-mirror · Aug 18, 2011 · beacd3e · beacd3e
1 parent 8805dab
commit beacd3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc2d86b04d9ac28a6be6cb05da6ea8f014fd5aa0
+refs/heads/master: 777d1d71db622a5e1ff703495741c3d257b532e5
diff --git a/trunk/tools/perf/util/parse-events.c b/trunk/tools/perf/util/parse-events.c
@@ -697,7 +697,11 @@ parse_raw_event(const char **strp, struct perf_event_attr *attr)
 		return EVT_FAILED;
 	n = hex2u64(str + 1, &config);
 	if (n > 0) {
-		*strp = str + n + 1;
+		const char *end = str + n + 1;
+		if (*end != '\0' && *end != ',' && *end != ':')
+			return EVT_FAILED;
+
+		*strp = end;
 		attr->type = PERF_TYPE_RAW;
 		attr->config = config;
 		return EVT_HANDLED;