X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.c;h=f79ac00e6f4c5313928d5a15bd560efbe41454d4;hp=b2608a186f83095b9faf20fd58a222eb4f2b0283;hb=bb45c03e2f9a46d9baf4ab7b93f57cd8f259f3d5;hpb=bdf640139afb02572eb23f014e4a61ad68fdfeb1

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index b2608a186..f79ac00e6 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -408,17 +408,20 @@ static int enable_event(struct agent_app *app, struct agent_event *event)
 	}
 	data_size = sizeof(msg) + filter_expression_length;
 
-	ret = send_header(app->sock, data_size, AGENT_CMD_ENABLE, 0);
-	if (ret < 0) {
-		goto error_io;
-	}
-
 	memset(&msg, 0, sizeof(msg));
 	msg.loglevel_value = htobe32(event->loglevel_value);
 	msg.loglevel_type = htobe32(event->loglevel_type);
-	strncpy(msg.name, event->name, sizeof(msg.name));
+	if (lttng_strncpy(msg.name, event->name, sizeof(msg.name))) {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
 	msg.filter_expression_length = htobe32(filter_expression_length);
 
+	ret = send_header(app->sock, data_size, AGENT_CMD_ENABLE, 0);
+	if (ret < 0) {
+		goto error_io;
+	}
+
 	bytes_to_send = zmalloc(data_size);
 	if (!bytes_to_send) {
 		ret = LTTNG_ERR_NOMEM;
@@ -747,13 +750,14 @@ int agent_enable_context(struct lttng_event_context *ctx,
 
 		agent_ctx = create_app_ctx(ctx);
 		if (!agent_ctx) {
+			ret = LTTNG_ERR_NOMEM;
 			goto error_unlock;
 		}
 
 		/* Enable event on agent application through TCP socket. */
 		ret = app_context_op(app, agent_ctx, AGENT_CMD_APP_CTX_ENABLE);
+		destroy_app_ctx(agent_ctx);
 		if (ret != LTTNG_OK) {
-			destroy_app_ctx(agent_ctx);
 			goto error_unlock;
 		}
 	}