X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=770a2ee4464f0b6962b9bd731095823b1feb9021;hb=989a08449dcb82204cd8caeb7841d5c20d32b475;hp=9e4d446aec60359c0311856339ddebb349d17bd5;hpb=19f912db83b1c2763c0708ef3e86d4c69841d3c3;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index 9e4d446ae..770a2ee44 100644
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -43,6 +43,7 @@
 #include "utils.h"
 #include "manage-consumer.h"
 #include "clear.h"
+#include "agent-thread.h"
 
 static bool is_root;
 
@@ -704,7 +705,7 @@ static enum lttng_error_code receive_lttng_trigger(struct command_ctx *cmd_ctx,
 	ssize_t sock_recv_len;
 	enum lttng_error_code ret_code;
 	struct lttng_payload trigger_payload;
-	struct lttng_trigger *trigger;
+	struct lttng_trigger *trigger = NULL;
 
 	lttng_payload_init(&trigger_payload);
 	trigger_len = (size_t) cmd_ctx->lsm.u.trigger.length;
@@ -754,6 +755,7 @@ static enum lttng_error_code receive_lttng_trigger(struct command_ctx *cmd_ctx,
 				trigger_len) {
 			ERR("Invalid trigger received as part of command payload");
 			ret_code = LTTNG_ERR_INVALID_TRIGGER;
+			lttng_trigger_put(trigger);
 			goto end;
 		}
 	}
@@ -1078,6 +1080,11 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	case LTTNG_DOMAIN_JUL:
 	case LTTNG_DOMAIN_LOG4J:
 	case LTTNG_DOMAIN_PYTHON:
+		if (!agent_tracing_is_enabled()) {
+			ret = LTTNG_ERR_AGENT_TRACING_DISABLED;
+			goto error;
+		}
+		/* Fallthrough */
 	case LTTNG_DOMAIN_UST:
 	{
 		if (!ust_app_supported()) {
@@ -1549,7 +1556,7 @@ error_add_context:
 	{
 		struct lttng_event *ev = NULL;
 		struct lttng_event_exclusion *exclusion = NULL;
-		struct lttng_filter_bytecode *bytecode = NULL;
+		struct lttng_bytecode *bytecode = NULL;
 		char *filter_expression = NULL;
 
 		/* Handle exclusion events and receive it from the client. */
@@ -2610,6 +2617,14 @@ static void *thread_manage_clients(void *data)
 			continue;
 		}
 
+		if (ret < LTTNG_OK || ret >= LTTNG_ERR_NR) {
+			WARN("Command returned an invalid status code, returning unknown error: "
+					"command type = %s (%d), ret = %d",
+					lttcomm_sessiond_command_str(cmd_ctx.lsm.cmd_type),
+					cmd_ctx.lsm.cmd_type, ret);
+			ret = LTTNG_ERR_UNK;
+		}
+
 		cmd_completion_handler = cmd_pop_completion_handler();
 		if (cmd_completion_handler) {
 			enum lttng_error_code completion_code;