Fix: lttng-live: lttng_live_open_trace_read memory leak

[babeltrace.git] / formats / lttng-live / lttng-live-plugin.c

diff --git a/formats/lttng-live/lttng-live-plugin.c b/formats/lttng-live/lttng-live-plugin.c
index 01d946be8acd11f6a0d4752338185fe36a215844..0bebdd890aca35a8658350eafdad81fadc99eef1 100644 (file)
--- a/formats/lttng-live/lttng-live-plugin.c
+++ b/formats/lttng-live/lttng-live-plugin.c
@@ -103,7 +103,7 @@ int setup_sighandler(void)
 static
 int parse_url(const char *path, struct lttng_live_ctx *ctx)
 {
-       char remain[3][MAXNAMLEN];
+       char remain[3][MAXNAMLEN] = { { 0 } };
        int ret = -1, proto, proto_offset = 0;
        size_t path_len = strlen(path); /* not accounting \0 */
 
@@ -185,6 +185,7 @@ int parse_url(const char *path, struct lttng_live_ctx *ctx)
        if (ret != 2) {
                fprintf(stderr, "[error] Format : "
                        "net://<hostname>/host/<traced_hostname>/<session_name>\n");
+               ret = -1;
                goto end;
        }
 
@@ -228,8 +229,12 @@ static void free_session_streams(struct lttng_live_session *lsession)
        struct lttng_live_viewer_stream *lvstream, *tmp;
 
        bt_list_for_each_entry_safe(lvstream, tmp, &lsession->stream_list,
-                       stream_node) {
-               bt_list_del(&lvstream->stream_node);
+                       session_stream_node) {
+               /*
+                * The stream should not be in trace anymore.
+                */
+               assert(!lvstream->in_trace);
+               bt_list_del(&lvstream->session_stream_node);
                g_free(lvstream);
        }
 }
@@ -283,6 +288,7 @@ static int lttng_live_open_trace_read(const char *path)
        }
 
 end_free:
+       g_array_free(ctx->session_ids, TRUE);
        g_hash_table_destroy(ctx->session->ctf_traces);
        free_session_streams(ctx->session);
        g_free(ctx->session);