X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.cpp;h=a52062e07f877ddc08ccf84604a56c5f2ff1fd59;hb=de5abcb02431896a1827dff5d3376e1f2e124cd7;hp=cf3fd44243bd18cbce118f4d53b37aa8000a0c15;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/client.cpp b/src/bin/lttng-sessiond/client.cpp
index cf3fd4424..a52062e07 100644
--- a/src/bin/lttng-sessiond/client.cpp
+++ b/src/bin/lttng-sessiond/client.cpp
@@ -45,13 +45,15 @@
 #include "testpoint.hpp"
 #include "utils.hpp"
 
-static bool is_root;
+namespace {
+bool is_root;
 
-static struct thread_state {
+struct thread_state {
 	sem_t ready;
 	bool running;
 	int client_sock;
 } thread_state;
+} /* namespace */
 
 static void set_thread_status(bool running)
 {
@@ -264,7 +266,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 					tmp = "";
 				}
 				tmplen = strlen(the_config.consumerd64_lib_dir.value) + 1 /* : */ + strlen(tmp);
-				tmpnew = (char *) zmalloc(tmplen + 1 /* \0 */);
+				tmpnew = zmalloc<char>(tmplen + 1 /* \0 */);
 				if (!tmpnew) {
 					ret = -ENOMEM;
 					goto error;
@@ -306,7 +308,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 					tmp = "";
 				}
 				tmplen = strlen(the_config.consumerd32_lib_dir.value) + 1 /* : */ + strlen(tmp);
-				tmpnew = (char *) zmalloc(tmplen + 1 /* \0 */);
+				tmpnew = zmalloc<char>(tmplen + 1 /* \0 */);
 				if (!tmpnew) {
 					ret = -ENOMEM;
 					goto error;
@@ -1751,7 +1753,7 @@ skip_domain:
 			goto error;
 		}
 
-		uris = (lttng_uri *) zmalloc(len);
+		uris = calloc<lttng_uri>(nb_uri);
 		if (uris == NULL) {
 			ret = LTTNG_ERR_FATAL;
 			goto error;
@@ -1892,31 +1894,35 @@ skip_domain:
 	case LTTNG_LIST_SESSIONS:
 	{
 		unsigned int nr_sessions;
-		lttng_session *sessions_payload;
-		size_t payload_len;
+		lttng_session *sessions_payload = nullptr;
+		size_t payload_len = 0;
 
 		session_lock_list();
 		nr_sessions = lttng_sessions_count(
 				LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
 				LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
 
-		payload_len = (sizeof(struct lttng_session) * nr_sessions) +
-				(sizeof(struct lttng_session_extended) * nr_sessions);
-		sessions_payload = (lttng_session *) zmalloc(payload_len);
+		if (nr_sessions > 0) {
+			payload_len = (sizeof(struct lttng_session) *
+						      nr_sessions) +
+					(sizeof(struct lttng_session_extended) *
+							nr_sessions);
+			sessions_payload = zmalloc<lttng_session>(payload_len);
+			if (!sessions_payload) {
+				session_unlock_list();
+				ret = -ENOMEM;
+				goto setup_error;
+			}
 
-		if (!sessions_payload) {
-			session_unlock_list();
-			ret = -ENOMEM;
-			goto setup_error;
+			cmd_list_lttng_sessions(sessions_payload, nr_sessions,
+					LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
+					LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
 		}
 
-		cmd_list_lttng_sessions(sessions_payload, nr_sessions,
-			LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
-			LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
 		session_unlock_list();
 
-		ret = setup_lttng_msg_no_cmd_header(cmd_ctx, sessions_payload,
-			payload_len);
+		ret = setup_lttng_msg_no_cmd_header(
+				cmd_ctx, sessions_payload, payload_len);
 		free(sessions_payload);
 
 		if (ret < 0) {
@@ -2390,7 +2396,6 @@ init_setup_error:
 static int create_client_sock(void)
 {
 	int ret, client_sock;
-	const mode_t old_umask = umask(0);
 
 	/* Create client tool unix socket */
 	client_sock = lttcomm_create_unix_sock(
@@ -2424,7 +2429,6 @@ static int create_client_sock(void)
 	DBG("Created client socket (fd = %i)", client_sock);
 	ret = client_sock;
 end:
-	umask(old_umask);
 	return ret;
 }