From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 14 Aug 2015 18:55:11 +0000 (-0400)
Subject: Fix: don't access missing ctf trace when getting metadata
X-Git-Tag: v1.4.4~12
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=b93293f64299d1d7ef7a55a67e42b27fa2262f19;hp=c0bed13943846ef9b60b22b88401741e918281ce

Fix: don't access missing ctf trace when getting metadata

We can get metadata when still in the trace open functions, in which
case the ctf trace is not allocated nor available yet. This fixes a
segmentation fault in stress-test.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c
index 2b793e5f..8059b338 100644
--- a/formats/lttng-live/lttng-live-comm.c
+++ b/formats/lttng-live/lttng-live-comm.c
@@ -607,6 +607,11 @@ int append_metadata(struct lttng_live_ctx *ctx,
 	struct lttng_live_viewer_stream *metadata;
 	char *metadata_buf = NULL;
 
+	if (!viewer_stream->ctf_trace->handle) {
+		printf_verbose("append_metadata: trace handle not ready yet.\n");
+		return 0;
+	}
+
 	printf_verbose("get_next_index: new metadata needed\n");
 	ret = get_new_metadata(ctx, viewer_stream, &metadata_buf);
 	if (ret < 0) {