X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=53a72d9b8d9129e04faac25ab84d81f214d2babd;hb=47e52862a8330d41800736a69de93cec9287cc9d;hp=f9e2bd6866f2caead30ac2cb0b6b892b69756b5e;hpb=dcabc1905756b2999886313ec33705f7571a3fb9;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index f9e2bd686..53a72d9b8 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -490,7 +490,7 @@ static int list_lttng_agent_events(struct agent *agt,
 	int i = 0, ret = 0;
 	unsigned int nb_event = 0;
 	struct agent_event *event;
-	struct lttng_event *tmp_events;
+	struct lttng_event *tmp_events = NULL;
 	struct lttng_ht_iter iter;
 	size_t extended_len = 0;
 	void *extended_at;
@@ -562,9 +562,12 @@ static int list_lttng_agent_events(struct agent *agt,
 	ret = nb_event;
 	assert(nb_event == i);
 
-error:
+end:
 	rcu_read_unlock();
 	return ret;
+error:
+	free(tmp_events);
+	goto end;
 }
 
 /*
@@ -769,6 +772,9 @@ static int list_lttng_kernel_events(char *channel_name,
 			memcpy(&(*events)[i].attr.probe, &event->event->u.kprobe,
 					sizeof(struct lttng_kernel_kprobe));
 			break;
+		case LTTNG_KERNEL_UPROBE:
+			(*events)[i].type = LTTNG_EVENT_USERSPACE_PROBE;
+			break;
 		case LTTNG_KERNEL_FUNCTION:
 			(*events)[i].type = LTTNG_EVENT_FUNCTION;
 			memcpy(&((*events)[i].attr.ftrace), &event->event->u.ftrace,