X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=b00324b2947be0f61e193a55bb2ca0eb27695c7a;hb=8692d4e5805da0104c690972bb96b60b8cb52685;hp=2af85fe476eb74abaf71ea7b456a6ee1723408b1;hpb=8571134087a7a1fbd83924ab5b98836ce6ca840a;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 2af85fe47..b00324b29 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -268,7 +268,11 @@ int loglevel_str_to_value(const char *inputstr)
 	int i = 0;
 	char str[LTTNG_SYMBOL_NAME_LEN];
 
-	while (i < LTTNG_SYMBOL_NAME_LEN && inputstr[i] != '\0') {
+	/*
+	 * Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is
+	 * added at the end of the loop so a the upper bound we avoid the overflow.
+	 */
+	while (i < (LTTNG_SYMBOL_NAME_LEN - 1) && inputstr[i] != '\0') {
 		str[i] = toupper(inputstr[i]);
 		i++;
 	}
@@ -336,7 +340,7 @@ static int enable_events(char *session_name)
 	} else if (opt_userspace) {
 		dom.type = LTTNG_DOMAIN_UST;
 		/* Default. */
-		dom.buf_type = LTTNG_BUFFER_PER_PID;
+		dom.buf_type = LTTNG_BUFFER_PER_UID;
 	} else {
 		ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
 		ret = CMD_ERROR;