X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=800859b8e55437919af0eba63d3278652eba1bed;hp=12bdf17cd9e63f3e4e8c19703766026f468e2918;hb=d31d3e8cf774b98a8ed46b8c7f6273364360f246;hpb=b4e3ceb9d379829bc5d6ec799f83086317aeafd8

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 12bdf17cd..800859b8e 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -326,7 +326,7 @@ static int list_lttng_ust_global_events(char *channel_name,
 	node = lttng_ht_iter_get_node_str(&iter);
 	if (node == NULL) {
 		ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
-		goto error;
+		goto end;
 	}
 
 	uchan = caa_container_of(&node->node, struct ltt_ust_channel, node.node);
@@ -335,7 +335,7 @@ static int list_lttng_ust_global_events(char *channel_name,
 	if (nb_event == 0) {
 		ret = nb_event;
 		*total_size = 0;
-		goto error;
+		goto end;
 	}
 
 	DBG3("Listing UST global %d events", nb_event);
@@ -350,6 +350,12 @@ static int list_lttng_ust_global_events(char *channel_name,
 		increment_extended_len(uevent->filter_expression,
 			&extended_len);
 	}
+	if (nb_event == 0) {
+		/* All events are internal, skip. */
+		ret = 0;
+		*total_size = 0;
+		goto end;
+	}
 
 	*total_size = nb_event * sizeof(struct lttng_event) + extended_len;
 	tmp = zmalloc(*total_size);
@@ -407,8 +413,7 @@ static int list_lttng_ust_global_events(char *channel_name,
 
 	ret = nb_event;
 	*events = tmp;
-
-error:
+end:
 	rcu_read_unlock();
 	return ret;
 }