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

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index c0086953a..770a2ee44 100644
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -705,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;
@@ -755,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;
 		}
 	}
@@ -1555,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. */
@@ -2617,7 +2618,10 @@ static void *thread_manage_clients(void *data)
 		}
 
 		if (ret < LTTNG_OK || ret >= LTTNG_ERR_NR) {
-			WARN("Command returned an invalid status code, returning unknown error: command type = %d, ret = %d", cmd_ctx.lsm.cmd_type, ret);
+			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;
 		}