X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=2d94204d37393c549a154a8d81f6fe8fcbf1b243;hb=2b00d46244cab86f1186a7b00cdc660f24a26f72;hp=505645bf1ce1cb69c864fadb322a3d366e493944;hpb=9b7cbebd7d78c0950c84cd834ce15d3298d997e6;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 505645bf1..2d94204d3 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -115,7 +115,7 @@ static int cmd_enable_event_internal(struct ltt_session *session,
 		const struct lttng_domain *domain,
 		char *channel_name, struct lttng_event *event,
 		char *filter_expression,
-		struct lttng_filter_bytecode *filter,
+		struct lttng_bytecode *filter,
 		struct lttng_event_exclusion *exclusion,
 		int wpipe);
 
@@ -2083,7 +2083,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 		const struct lttng_domain *domain,
 		char *channel_name, struct lttng_event *event,
 		char *filter_expression,
-		struct lttng_filter_bytecode *filter,
+		struct lttng_bytecode *filter,
 		struct lttng_event_exclusion *exclusion,
 		int wpipe, bool internal_event)
 {
@@ -2166,7 +2166,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 		case LTTNG_EVENT_ALL:
 		{
 			char *filter_expression_a = NULL;
-			struct lttng_filter_bytecode *filter_a = NULL;
+			struct lttng_bytecode *filter_a = NULL;
 
 			/*
 			 * We need to duplicate filter_expression and filter,
@@ -2401,11 +2401,11 @@ static int _cmd_enable_event(struct ltt_session *session,
 
 		{
 			char *filter_expression_copy = NULL;
-			struct lttng_filter_bytecode *filter_copy = NULL;
+			struct lttng_bytecode *filter_copy = NULL;
 
 			if (filter) {
 				const size_t filter_size = sizeof(
-						struct lttng_filter_bytecode)
+						struct lttng_bytecode)
 						+ filter->len;
 
 				filter_copy = zmalloc(filter_size);
@@ -2481,7 +2481,7 @@ int cmd_enable_event(struct ltt_session *session,
 		const struct lttng_domain *domain,
 		char *channel_name, struct lttng_event *event,
 		char *filter_expression,
-		struct lttng_filter_bytecode *filter,
+		struct lttng_bytecode *filter,
 		struct lttng_event_exclusion *exclusion,
 		int wpipe)
 {
@@ -2498,7 +2498,7 @@ static int cmd_enable_event_internal(struct ltt_session *session,
 		const struct lttng_domain *domain,
 		char *channel_name, struct lttng_event *event,
 		char *filter_expression,
-		struct lttng_filter_bytecode *filter,
+		struct lttng_bytecode *filter,
 		struct lttng_event_exclusion *exclusion,
 		int wpipe)
 {
@@ -4459,10 +4459,12 @@ enum lttng_error_code cmd_register_trigger(const struct lttng_credentials *cmd_c
 	 * reference to the trigger so the caller doesn't have to care if those
 	 * are distinct instances or not.
 	 */
-	lttng_trigger_get(trigger);
-	*return_trigger = trigger;
-	/* Ownership of trigger was transferred to caller. */
-	trigger = NULL;
+	if (ret_code == LTTNG_OK) {
+		lttng_trigger_get(trigger);
+		*return_trigger = trigger;
+		/* Ownership of trigger was transferred to caller. */
+		trigger = NULL;
+	}
 end:
 	return ret_code;
 end_unlock_session_list: