Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
/*
* Fill lttng_channel array of all channels.
*/
/*
* Fill lttng_channel array of all channels.
*/
-static void list_lttng_channels(enum lttng_domain_type domain,
+static ssize_t list_lttng_channels(enum lttng_domain_type domain,
struct ltt_session *session, struct lttng_channel *channels,
struct lttcomm_channel_extended *chan_exts)
{
struct ltt_session *session, struct lttng_channel *channels,
struct lttcomm_channel_extended *chan_exts)
{
struct ltt_kernel_channel *kchan;
DBG("Listing channels for session %s", session->name);
struct ltt_kernel_channel *kchan;
DBG("Listing channels for session %s", session->name);
+ if (ret < 0) {
+ return -LTTNG_ERR_FATAL;
+ } else {
+ return LTTNG_OK;
+ }
}
static void increment_extended_len(const char *filter_expression,
}
static void increment_extended_len(const char *filter_expression,
channel_exts = ((void *) *channels) +
(nb_chan * sizeof(struct lttng_channel));
channel_exts = ((void *) *channels) +
(nb_chan * sizeof(struct lttng_channel));
- list_lttng_channels(domain, session, *channels, channel_exts);
+ ret = list_lttng_channels(domain, session, *channels, channel_exts);
+ if (ret != LTTNG_OK) {
+ free(*channels);
+ *channels = NULL;
+ goto end;
+ }
} else {
*channels = NULL;
}
} else {
*channels = NULL;
}