X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fcommon%2Fmetadata%2Fdecoder.c;h=c52b4fc640cd2d9926f207d5dda83e8244bfd771;hb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;hp=aad6aa1e571c2bd54bbe1d2087d630d8e6742d30;hpb=a2a545450763347fd1c1e5c089a296238e1cbc11;p=babeltrace.git

diff --git a/plugins/ctf/common/metadata/decoder.c b/plugins/ctf/common/metadata/decoder.c
index aad6aa1e..c52b4fc6 100644
--- a/plugins/ctf/common/metadata/decoder.c
+++ b/plugins/ctf/common/metadata/decoder.c
@@ -23,7 +23,7 @@
 #include <assert.h>
 #include <babeltrace/compat/uuid-internal.h>
 #include <babeltrace/compat/memstream-internal.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 #include <glib.h>
 #include <string.h>
 
@@ -33,7 +33,7 @@
 
 #define TSDL_MAGIC	0x75d11d57
 
-BT_HIDDEN
+extern
 int yydebug;
 
 struct ctf_metadata_decoder {
@@ -103,6 +103,11 @@ int decode_packet(struct ctf_metadata_decoder *mdec, FILE *in_fp, FILE *out_fp,
 	int ret = 0;
 	const long offset = ftell(in_fp);
 
+	if (offset < 0) {
+		BT_LOGE_ERRNO("Failed to get current metadata file position",
+			".");
+		goto error;
+	}
 	BT_LOGV("Decoding metadata packet: mdec-addr=%p, offset=%ld",
 		mdec, offset);
 	readlen = fread(&header, sizeof(header), 1, in_fp);
@@ -207,20 +212,28 @@ int decode_packet(struct ctf_metadata_decoder *mdec, FILE *in_fp, FILE *out_fp,
 	toread = header.content_size / CHAR_BIT - sizeof(header);
 
 	for (;;) {
-		readlen = fread(buf, sizeof(uint8_t),
-			MIN(sizeof(buf) - 1, toread), in_fp);
+		size_t loop_read;
+
+		loop_read = MIN(sizeof(buf) - 1, toread);
+		readlen = fread(buf, sizeof(uint8_t), loop_read, in_fp);
 		if (ferror(in_fp)) {
 			BT_LOGE("Cannot read metadata packet buffer: "
-				"offset=%ld, read-size=%u",
-				ftell(in_fp), (unsigned int) readlen);
+				"offset=%ld, read-size=%zu",
+				ftell(in_fp), loop_read);
+			goto error;
+		}
+		if (readlen > loop_read) {
+			BT_LOGE("fread returned more byte than expected: "
+				"read-size-asked=%zu, read-size-returned=%zu",
+				loop_read, readlen);
 			goto error;
 		}
 
 		writelen = fwrite(buf, sizeof(uint8_t), readlen, out_fp);
 		if (writelen < readlen || ferror(out_fp)) {
 			BT_LOGE("Cannot write decoded metadata text to buffer: "
-				"read-offset=%ld, write-size=%u",
-				ftell(in_fp), (unsigned int) readlen);
+				"read-offset=%ld, write-size=%zu",
+				ftell(in_fp), readlen);
 			goto error;
 		}
 
@@ -291,6 +304,13 @@ int ctf_metadata_decoder_packetized_file_stream_to_buf_with_mdec(
 
 	/* Close stream, which also flushes the buffer */
 	ret = bt_close_memstream(buf, &size, out_fp);
+	/*
+	 * See fclose(3). Further access to out_fp after both success
+	 * and error, even through another bt_close_memstream(), results
+	 * in undefined behavior. Nullify out_fp to ensure we don't
+	 * fclose it twice on error.
+	 */
+	out_fp = NULL;
 	if (ret < 0) {
 		BT_LOGE("Cannot close memory stream: %s: mdec-addr=%p",
 			strerror(errno), mdec);
@@ -336,7 +356,6 @@ struct ctf_metadata_decoder *ctf_metadata_decoder_create(
 	struct ctf_metadata_decoder_config default_config = {
 		.clock_class_offset_s = 0,
 		.clock_class_offset_ns = 0,
-		.strict = false,
 	};
 
 	if (!config) {
@@ -345,10 +364,9 @@ struct ctf_metadata_decoder *ctf_metadata_decoder_create(
 
 	BT_LOGD("Creating CTF metadata decoder: "
 		"clock-class-offset-s=%" PRId64 ", "
-		"clock-class-offset-ns=%" PRId64 ", "
-		"strict=%d, name=\"%s\"",
+		"clock-class-offset-ns=%" PRId64 ", name=\"%s\"",
 		config->clock_class_offset_s, config->clock_class_offset_ns,
-		config->strict, name);
+		name);
 
 	if (!mdec) {
 		BT_LOGE_STR("Failed to allocate one CTF metadata decoder.");
@@ -368,9 +386,9 @@ struct ctf_metadata_decoder *ctf_metadata_decoder_create(
 	BT_LOGD("Creating CTF metadata decoder: "
 		"clock-class-offset-s=%" PRId64 ", "
 		"clock-class-offset-ns=%" PRId64 ", "
-		"strict=%d, name=\"%s\", addr=%p",
+		"name=\"%s\", addr=%p",
 		config->clock_class_offset_s, config->clock_class_offset_ns,
-		config->strict, name, mdec);
+		name, mdec);
 
 end:
 	return mdec;
@@ -433,6 +451,12 @@ enum ctf_metadata_decoder_status ctf_metadata_decoder_decode(
 
 		BT_LOGD("Metadata stream is plain text: mdec-addr=%p", mdec);
 
+		if (init_pos < 0) {
+			BT_LOGE_ERRNO("Failed to get current file position", ".");
+			status = CTF_METADATA_DECODER_STATUS_ERROR;
+			goto end;
+		}
+
 		/* Check text-only metadata header and version */
 		nr_items = fscanf(fp, "/* CTF %10u.%10u", &major, &minor);
 		if (nr_items < 2) {
@@ -528,7 +552,7 @@ end:
 }
 
 BT_HIDDEN
-struct bt_ctf_trace *ctf_metadata_decoder_get_trace(
+struct bt_trace *ctf_metadata_decoder_get_trace(
 		struct ctf_metadata_decoder *mdec)
 {
 	return ctf_visitor_generate_ir_get_trace(mdec->visitor);