X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=759708856b0a2044c4802325d2a2434ae0525287;hb=2d686891bc3f1a80bff4bfdcea70f30a057ee388;hp=c9eeafa5927b09edb5841ac3906bd90b4f567755;hpb=64f5abe1e7f8157301b54c45e7f2977e46470f6c;p=babeltrace.git

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index c9eeafa5..75970885 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -1489,28 +1489,28 @@ begin:
 			fprintf(stderr, "[error] Unable to read packet context: %s\n", strerror(-ret));
 			return ret;
 		}
-		/* read content size from header */
-		len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
+		/* read packet size from header */
+		len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
 		if (len_index >= 0) {
 			struct bt_definition *field;
 
 			field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-			packet_index.content_size = bt_get_unsigned_int(field);
+			packet_index.packet_size = bt_get_unsigned_int(field);
 		} else {
 			/* Use file size for packet size */
-			packet_index.content_size = filesize * CHAR_BIT;
+			packet_index.packet_size = filesize * CHAR_BIT;
 		}
 
-		/* read packet size from header */
-		len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
+		/* read content size from header */
+		len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
 		if (len_index >= 0) {
 			struct bt_definition *field;
 
 			field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-			packet_index.packet_size = bt_get_unsigned_int(field);
+			packet_index.content_size = bt_get_unsigned_int(field);
 		} else {
-			/* Use content size if non-zero, else file size */
-			packet_index.packet_size = packet_index.content_size ? : filesize * CHAR_BIT;
+			/* Use packet size if non-zero, else file size */
+			packet_index.content_size = packet_index.packet_size ? : filesize * CHAR_BIT;
 		}
 
 		/* read timestamp begin from header */
@@ -1554,9 +1554,9 @@ begin:
 		}
 	} else {
 		/* Use file size for packet size */
-		packet_index.content_size = filesize * CHAR_BIT;
-		/* Use content size if non-zero, else file size */
-		packet_index.packet_size = packet_index.content_size ? : filesize * CHAR_BIT;
+		packet_index.packet_size = filesize * CHAR_BIT;
+		/* Use packet size if non-zero, else file size */
+		packet_index.content_size = packet_index.packet_size ? : filesize * CHAR_BIT;
 	}
 
 	/* Validate content size and packet size values */
@@ -1572,6 +1572,11 @@ begin:
 		return -EINVAL;
 	}
 
+	if ((packet_index.packet_size >> LOG2_CHAR_BIT) == 0) {
+		fprintf(stderr, "[error] Invalid CTF stream: packet size needs to be at least one byte\n");
+		return -EINVAL;
+	}
+
 	/* Save position after header and context */
 	packet_index.data_offset = pos->offset;