X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=37d17f5839e2ebb4047a4f338e6634be44c9b2e8;hp=033537e67d06325dde8de438c0a183005b148714;hb=53532829c4c9a9c22eccc72cd84bf5b0b57b33e0;hpb=c8b219a3168dd382a167a72406e268550005e662

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 033537e6..37d17f58 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -125,7 +125,7 @@ int get_unary_uuid(struct cds_list_head *head, uuid_t *uuid)
 }
 
 static
-struct ctf_stream *trace_stream_lookup(struct ctf_trace *trace, uint64_t stream_id)
+struct ctf_stream_class *trace_stream_lookup(struct ctf_trace *trace, uint64_t stream_id)
 {
 	if (trace->streams->len <= stream_id)
 		return NULL;
@@ -1088,6 +1088,12 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
 				return NULL;
 			}
 			alignment = right->u.unary_expression.u.unsigned_constant;
+			/* Make sure alignment is a power of two */
+			if (alignment == 0 || (alignment & (alignment - 1)) != 0) {
+				fprintf(fd, "[error] %s: align: expecting power of two\n",
+					__func__);
+				return NULL;
+			}
 			has_alignment = 1;
 		} else {
 			fprintf(fd, "[error] %s: unknown attribute name %s\n",
@@ -1156,6 +1162,12 @@ struct declaration *ctf_declaration_floating_point_visit(FILE *fd, int depth,
 				return NULL;
 			}
 			alignment = right->u.unary_expression.u.unsigned_constant;
+			/* Make sure alignment is a power of two */
+			if (alignment == 0 || (alignment & (alignment - 1)) != 0) {
+				fprintf(fd, "[error] %s: align: expecting power of two\n",
+					__func__);
+				return NULL;
+			}
 			has_alignment = 1;
 		} else {
 			fprintf(fd, "[error] %s: unknown attribute name %s\n",
@@ -1515,7 +1527,7 @@ error:
 
  
 static
-int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_stream *stream, struct ctf_trace *trace)
+int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_stream_class *stream, struct ctf_trace *trace)
 {
 	int ret = 0;
 
@@ -1637,10 +1649,10 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node,
 {
 	int ret = 0;
 	struct ctf_node *iter;
-	struct ctf_stream *stream;
+	struct ctf_stream_class *stream;
 	struct definition_scope *parent_def_scope;
 
-	stream = g_new0(struct ctf_stream, 1);
+	stream = g_new0(struct ctf_stream_class, 1);
 	stream->declaration_scope = new_declaration_scope(parent_declaration_scope);
 	stream->events_by_id = g_ptr_array_new();
 	stream->event_quark_to_id = g_hash_table_new(g_direct_hash, g_direct_equal);