From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Tue, 3 Aug 2010 03:13:32 +0000 (-0400)
Subject: fix invalid array access
X-Git-Tag: v0.6~3
X-Git-Url: https://git.lttng.org/?p=ust.git;a=commitdiff_plain;h=eddb0f66ac5c9175433828c3f72211115474ddb7

fix invalid array access

reported by Damien Cottier
---

diff --git a/libust/marker.c b/libust/marker.c
index 4dc7de1..19467d1 100644
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -439,7 +439,7 @@ static struct marker_entry *add_marker(const char *channel, const char *name,
 	e->name = &e->channel[channel_len];
 	memcpy(e->name, name, name_len);
 	if (format) {
-		e->format = &e->name[channel_len + name_len];
+		e->format = &e->name[name_len];
 		memcpy(e->format, format, format_len);
 		if (strcmp(e->format, MARK_NOARGS) == 0)
 			e->call = marker_probe_cb_noarg;