X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fstring.c;h=c6935162d6c823b31315300a454bdf9109862739;hb=8099326b3438eb003bf3f9849ad1b3cd1f0d618c;hp=357e273a4e8929a130445ed764f6473e61ea0892;hpb=71dd417a2b700c2315ef9919104572df1bc83f7a;p=babeltrace.git

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index 357e273a..c6935162 100644
--- a/formats/ctf/types/string.c
+++ b/formats/ctf/types/string.c
@@ -28,10 +28,10 @@
 
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/ctf/types.h>
-#include <limits.h>		/* C99 limits */
+#include <babeltrace/compat/limits.h>	/* C99 limits */
 #include <string.h>
 
-int ctf_string_read(struct stream_pos *ppos, struct definition *definition)
+int ctf_string_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_string *string_definition =
 		container_of(definition, struct definition_string, p);
@@ -39,19 +39,21 @@ int ctf_string_read(struct stream_pos *ppos, struct definition *definition)
 		string_definition->declaration;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 	size_t len;
-	ssize_t max_len;
+	ssize_t max_len_bits;
 	char *srcaddr;
 
-	ctf_align_pos(pos, string_declaration->p.alignment);
+	if (!ctf_align_pos(pos, string_declaration->p.alignment))
+		return -EFAULT;
 
 	srcaddr = ctf_get_pos_addr(pos);
 	if (pos->offset == EOF)
 		return -EFAULT;
-	/* Not counting \0 */
-	max_len = pos->packet_size - pos->offset - 1;
-	if (max_len < 0)
+	/* Not counting \0. Counting in bits. */
+	max_len_bits = pos->packet_size - pos->offset - CHAR_BIT;
+	if (max_len_bits < 0)
 		return -EFAULT;
-	len = strnlen(srcaddr, max_len) + 1;	/* Add \0 */
+	/* Add \0, counting in bytes. */
+	len = strnlen(srcaddr, (size_t) max_len_bits / CHAR_BIT) + 1;
 	/* Truncated string, unexpected. Trace probably corrupted. */
 	if (srcaddr[len - 1] != '\0')
 		return -EFAULT;
@@ -64,12 +66,13 @@ int ctf_string_read(struct stream_pos *ppos, struct definition *definition)
 	printf_debug("CTF string read %s\n", srcaddr);
 	memcpy(string_definition->value, srcaddr, len);
 	string_definition->len = len;
-	ctf_move_pos(pos, len * CHAR_BIT);
+	if (!ctf_move_pos(pos, len * CHAR_BIT))
+		return -EFAULT;
 	return 0;
 }
 
-int ctf_string_write(struct stream_pos *ppos,
-		      struct definition *definition)
+int ctf_string_write(struct bt_stream_pos *ppos,
+		      struct bt_definition *definition)
 {
 	struct definition_string *string_definition =
 		container_of(definition, struct definition_string, p);
@@ -79,7 +82,8 @@ int ctf_string_write(struct stream_pos *ppos,
 	size_t len;
 	char *destaddr;
 
-	ctf_align_pos(pos, string_declaration->p.alignment);
+	if (!ctf_align_pos(pos, string_declaration->p.alignment))
+		return -EFAULT;
 	assert(string_definition->value != NULL);
 	len = string_definition->len;
 
@@ -91,6 +95,7 @@ int ctf_string_write(struct stream_pos *ppos,
 	destaddr = ctf_get_pos_addr(pos);
 	memcpy(destaddr, string_definition->value, len);
 end:
-	ctf_move_pos(pos, len * CHAR_BIT);
+	if (!ctf_move_pos(pos, len * CHAR_BIT))
+		return -EFAULT;
 	return 0;
 }