X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=d72250b1e4041a56ea4612f029e00417f6212cbd;hb=a878d96125906e6660e6ef3d1f970c13a4e22fbd;hp=7a38699d9c8438cbedd423a12fd2204884dc266f;hpb=a5c2d2a71919b8d1542b62f6d32579125cc2c8f8;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 7a38699d9..d72250b1e 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -3,7 +3,7 @@
  *
  * Linux Trace Toolkit Control Library
  *
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * SPDX-License-Identifier: LGPL-2.1-only
@@ -388,7 +388,7 @@ static int set_session_daemon_path(void)
 		in_tgroup = lttng_check_tracing_group();
 	}
 
-	if ((uid == 0) || in_tgroup) {
+	if ((uid == 0) || in_tgroup == 1) {
 		const int ret = lttng_strncpy(sessiond_sock_path,
 				DEFAULT_GLOBAL_CLIENT_UNIX_SOCK,
 				sizeof(sessiond_sock_path));
@@ -1204,7 +1204,7 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 	for (i = 0; i < exclusion_count; i++) {
 		size_t exclusion_len;
 
-		exclusion_len = lttng_strnlen(*(exclusion_list + i),
+		exclusion_len = lttng_strnlen(exclusion_list[i],
 				LTTNG_SYMBOL_NAME_LEN);
 		if (exclusion_len == LTTNG_SYMBOL_NAME_LEN) {
 			/* Exclusion is not NULL-terminated. */
@@ -1213,7 +1213,17 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 		}
 
 		ret = lttng_dynamic_buffer_append(&payload.buffer,
-				*(exclusion_list + i), LTTNG_SYMBOL_NAME_LEN);
+				exclusion_list[i], exclusion_len);
+		if (ret) {
+			goto mem_error;
+		}
+
+		/*
+		 * Padding the rest of the entry with zeros. Every exclusion
+		 * entries take LTTNG_SYMBOL_NAME_LEN bytes in the buffer.
+		 */
+		ret = lttng_dynamic_buffer_set_size(&payload.buffer,
+				LTTNG_SYMBOL_NAME_LEN * (i + 1));
 		if (ret) {
 			goto mem_error;
 		}
@@ -2092,6 +2102,12 @@ int lttng_list_sessions(struct lttng_session **out_sessions)
 
 	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_LIST_SESSIONS;
+	/*
+	 * Initialize out_sessions to NULL so it is initialized when
+	 * lttng_list_sessions returns 0, thus allowing *out_sessions to
+	 * be subsequently freed.
+	 */
+	*out_sessions = NULL;
 	ret = lttng_ctl_ask_sessiond(&lsm, (void**) &sessions);
 	if (ret <= 0) {
 		goto end;
@@ -2104,7 +2120,6 @@ int lttng_list_sessions(struct lttng_session **out_sessions)
 	if (ret % session_size) {
 		ret = -LTTNG_ERR_UNK;
 		free(sessions);
-		*out_sessions = NULL;
 		goto end;
 	}
 	session_count = (size_t) ret / session_size;
@@ -2608,14 +2623,19 @@ end:
  */
 int lttng_set_tracing_group(const char *name)
 {
+	char *new_group;
 	if (name == NULL) {
 		return -LTTNG_ERR_INVALID;
 	}
 
-	if (asprintf(&tracing_group, "%s", name) < 0) {
+	if (asprintf(&new_group, "%s", name) < 0) {
 		return -LTTNG_ERR_FATAL;
 	}
 
+	free(tracing_group);
+	tracing_group = new_group;
+	new_group = NULL;
+
 	return 0;
 }