From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 11 May 2015 21:38:50 +0000 (-0400)
Subject: ir: validate sequence length fields and variant tags of stream classes
X-Git-Tag: v2.0.0-pre1~1239
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=2bd7f864589729c1e9bb2824b13a62a687d7e9f7

ir: validate sequence length fields and variant tags of stream classes

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c
index 3fa90aa9..b8f4f725 100644
--- a/formats/ctf/ir/trace.c
+++ b/formats/ctf/ir/trace.c
@@ -33,6 +33,7 @@
 #include <babeltrace/ctf-writer/functor-internal.h>
 #include <babeltrace/ctf-ir/event-types-internal.h>
 #include <babeltrace/ctf-ir/attributes-internal.h>
+#include <babeltrace/ctf-ir/visitor-internal.h>
 #include <babeltrace/ctf-ir/utils.h>
 #include <babeltrace/compiler.h>
 #include <babeltrace/objects.h>
@@ -449,6 +450,11 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
 		}
 	}
 
+	ret = bt_ctf_stream_class_resolve_types(stream_class, trace);
+	if (ret) {
+		goto end;
+	}
+
 	stream_id = bt_ctf_stream_class_get_id(stream_class);
 	if (stream_id < 0) {
 		stream_id = trace->next_stream_id++;
@@ -888,6 +894,7 @@ struct bt_ctf_field_type *get_field_type(enum field_type_alias alias)
 static
 void bt_ctf_trace_freeze(struct bt_ctf_trace *trace)
 {
+	bt_ctf_trace_resolve_types(trace);
 	bt_ctf_attributes_freeze(trace->environment);
 	trace->frozen = 1;
 }