X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=dd7ee0d4bdc04ecde16be3a2542be76d0c39a2ad;hb=f470a390fe7dca4ede0a5808426ff0467e5bd4d1;hp=7fe0f9a4b6344f35caccd8315a5746df57d5cd0e;hpb=44e96653751b3d75c823abc6275d8e732738c789;p=lttng-tools.git

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 7fe0f9a4b..dd7ee0d4b 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -362,6 +362,8 @@ static void teardown_ust_session(struct ltt_session *session)
 
 	DBG("Tearing down UST session(s)");
 
+	if (!session->ust_session)
+		return;
 	ret = ust_app_destroy_trace_all(session->ust_session);
 	if (ret) {
 		ERR("Error in ust_app_destroy_trace_all");
@@ -1915,6 +1917,7 @@ static void list_lttng_channels(int domain, struct ltt_session *session,
 			channels[i].attr.read_timer_interval =
 				uchan->attr.read_timer_interval;
 			channels[i].attr.output = uchan->attr.output;
+			i++;
 		}
 		break;
 	}