X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=10517fbc0f999ac8c7497f34e9756ec29a72cb6a;hb=d75bffee2ba2d4fd895dbc15e399db95e88fdb92;hp=f0cf12aa0b74360e571ea03c2837872b496fccd8;hpb=51f1c868822e8b44ee720ed9be5a4b67de61a75e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index f0cf12aa0..10517fbc0 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1758,6 +1758,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 
 		{
 			struct lttng_filter_bytecode *filter_copy = NULL;
+			char *filter_expression_copy = NULL;
 
 			if (filter) {
 				filter_copy = zmalloc(
@@ -1768,16 +1769,28 @@ static int _cmd_enable_event(struct ltt_session *session,
 				}
 
 				memcpy(filter_copy, filter,
-					sizeof(struct lttng_filter_bytecode)
-					+ filter->len);
+				       sizeof(struct lttng_filter_bytecode)
+				       + filter->len);
+			}
+
+			if (filter_expression) {
+				filter_expression_copy =
+						strdup(filter_expression);
+				if (!filter_expression) {
+					ret = LTTNG_ERR_NOMEM;
+					goto error_free_copy;
+				}
 			}
 
 			ret = cmd_enable_event_internal(session, &tmp_dom,
 					(char *) default_chan_name,
-					&uevent, filter_expression, filter_copy,
-					NULL, wpipe);
-			/* We have passed ownership */
-			filter_expression = NULL;
+					&uevent, filter_expression_copy,
+					filter_copy, NULL, wpipe);
+			filter_copy = NULL;
+			filter_expression_copy = NULL;
+error_free_copy:
+			free(filter_copy);
+			free(filter_expression_copy);
 		}
 
 		if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
@@ -1786,10 +1799,12 @@ static int _cmd_enable_event(struct ltt_session *session,
 
 		/* The wild card * means that everything should be enabled. */
 		if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
-			ret = event_agent_enable_all(usess, agt, event, filter);
+			ret = event_agent_enable_all(usess, agt, event, filter,
+					filter_expression);
 			filter = NULL;
 		} else {
-			ret = event_agent_enable(usess, agt, event, filter);
+			ret = event_agent_enable(usess, agt, event, filter,
+					filter_expression);
 			filter = NULL;
 		}
 		if (ret != LTTNG_OK) {