X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=d685b6cd70f4b9ef9362747bb7fa8862a430f086;hp=ce21464e562b0601540f7beacb96c8da3b597c20;hb=da75b0f7af646e4bd6a7cf3747c6a1402fc1967d;hpb=2d0bea29e27a0f1a9b651bb98dac7bf0c2550f78

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index ce21464e..d685b6cd 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -3,7 +3,9 @@
  *
  * Format registration.
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -156,14 +158,17 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 		}
 
 		/* lookup timestamp */
+		stream->has_timestamp = 0;
 		integer_definition = lookup_integer(&stream->stream_event_header->p, "timestamp", FALSE);
 		if (integer_definition) {
 			ctf_update_timestamp(stream, integer_definition);
+			stream->has_timestamp = 1;
 		} else {
 			if (variant) {
 				integer_definition = lookup_integer(variant, "timestamp", FALSE);
 				if (integer_definition) {
 					ctf_update_timestamp(stream, integer_definition);
+					stream->has_timestamp = 1;
 				}
 			}
 		}
@@ -470,7 +475,7 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
 {
 	struct metadata_packet_header header;
 	size_t readlen, writelen, toread;
-	char buf[4096];
+	char buf[4096 + 1];	/* + 1 for debug-mode \0 */
 	int ret = 0;
 
 	readlen = fread(&header, header_sizeof(header), 1, in);
@@ -511,12 +516,13 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
 	toread = (header.content_size / CHAR_BIT) - header_sizeof(header);
 
 	for (;;) {
-		readlen = fread(buf, sizeof(char), min(sizeof(buf), toread), in);
+		readlen = fread(buf, sizeof(char), min(sizeof(buf) - 1, toread), in);
 		if (ferror(in)) {
 			ret = -EINVAL;
 			break;
 		}
 		if (babeltrace_debug) {
+			buf[readlen] = '\0';
 			fprintf(stdout, "[debug] metadata packet read: %s\n",
 				buf);
 		}
@@ -605,6 +611,8 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td)
 		ret = ctf_open_trace_metadata_stream_read(td, &fp, &buf);
 		if (ret)
 			goto end_packet_read;
+	} else {
+		td->byte_order = BYTE_ORDER;
 	}
 
 	scanner = ctf_scanner_alloc(fp);
@@ -633,7 +641,7 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td)
 		goto end;
 	}
 	ret = ctf_visitor_construct_metadata(stdout, 0, &scanner->ast->root,
-			td, BYTE_ORDER);
+			td, td->byte_order);
 	if (ret) {
 		fprintf(stdout, "[error] Error in CTF metadata constructor %d\n", ret);
 		goto end;
@@ -902,13 +910,12 @@ int create_stream_packet_index(struct ctf_trace *td,
 				return -EINVAL;
 			}
 			file_stream->parent.stream_class = stream;
+			ret = create_stream_definitions(td, &file_stream->parent);
+			if (ret)
+				return ret;
 		}
 		first_packet = 0;
 
-		ret = create_stream_definitions(td, &file_stream->parent);
-		if (ret)
-			return ret;
-
 		if (file_stream->parent.stream_packet_context) {
 			/* Read packet context */
 			ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p);
@@ -987,7 +994,7 @@ int create_stream_packet_index(struct ctf_trace *td,
 
 		if (packet_index.packet_size > (filestats.st_size - packet_index.offset) * CHAR_BIT) {
 			fprintf(stdout, "[error] Packet size (%zu bits) is larger than remaining file size (%zu bits).\n",
-				packet_index.content_size, (filestats.st_size - packet_index.offset) * CHAR_BIT);
+				packet_index.content_size, (size_t) (filestats.st_size - packet_index.offset) * CHAR_BIT);
 			return -EINVAL;
 		}