X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fstring.c;fp=formats%2Fctf%2Ftypes%2Fstring.c;h=002f1b4fb335f5bb34d776fa79d36b5f9bf83c35;hp=a2433bf5922d2013e80f19a1e1897842657de535;hb=024e61817685a20caceb4e3ef3bdc019a7af6b6e;hpb=13ec125abb88a60fc5e11ff904b525e1f00a331b

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index a2433bf5..002f1b4f 100644
--- a/formats/ctf/types/string.c
+++ b/formats/ctf/types/string.c
@@ -39,19 +39,21 @@ int ctf_string_read(struct bt_stream_pos *ppos, struct bt_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,7 +66,8 @@ int ctf_string_read(struct bt_stream_pos *ppos, struct bt_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;
 }
 
@@ -79,7 +82,8 @@ int ctf_string_write(struct bt_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 bt_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;
 }