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 dfabb986922341d1ea72bc004d190113a221c774..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;
        }
 
@@ -223,6 +224,21 @@ gboolean g_uint64p_equal(gconstpointer a, gconstpointer b)
        return TRUE;
 }
 
+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,
+                       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);
+       }
+}
+
 static int lttng_live_open_trace_read(const char *path)
 {
        int ret = 0;
@@ -231,6 +247,8 @@ static int lttng_live_open_trace_read(const char *path)
        ctx = g_new0(struct lttng_live_ctx, 1);
        ctx->session = g_new0(struct lttng_live_session, 1);
 
+       BT_INIT_LIST_HEAD(&ctx->session->stream_list);
+
        /* We need a pointer to the context from the packet_seek function. */
        ctx->session->ctx = ctx;
 
@@ -270,9 +288,10 @@ 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);
-       g_free(ctx->session->streams);
        g_free(ctx);
 
        if (lttng_live_should_quit()) {