X-Git-Url: http://git.liburcu.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=e2c4c553f40c736917627c9091c1c02836e0f765;hp=b7b80d366c6ed60d9027ffcfd1e3320c60cc18d0;hb=5e28af3877ffdb24d0462d9a4ba77f2128cf9cc7;hpb=9e814a301499a6ca2b7e89893588f84c310530f2

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index b7b80d366..e2c4c553f 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -512,12 +512,14 @@ int event_agent_enable(struct ltt_ust_session *usess,
 			ret = LTTNG_ERR_NOMEM;
 			goto error;
 		}
-
+		filter = NULL;
+		filter_expression = NULL;
 		created = 1;
 	}
 
 	/* Already enabled? */
 	if (aevent->enabled) {
+		ret = LTTNG_OK;
 		goto end;
 	}
 
@@ -538,13 +540,16 @@ int event_agent_enable(struct ltt_ust_session *usess,
 		agent_add_event(aevent, agt);
 	}
 
-end:
-	return LTTNG_OK;
+	ret = LTTNG_OK;
+	goto end;
 
 error:
 	if (created) {
 		agent_destroy_event(aevent);
 	}
+end:
+	free(filter);
+	free(filter_expression);
 	return ret;
 }