Fix null pointer dereference when destroying a UST session with no channels

[lttng-tools.git] / lttng-sessiond / main.c

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 7fe0f9a4b6344f35caccd8315a5746df57d5cd0e..dd7ee0d4bdc04ecde16be3a2542be76d0c39a2ad 100644 (file)
--- 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;
        }