X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fsequence.c;h=518b13d52fe29d1052b4b4787b6a221573518795;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=898c36725672c8e4b01084e1850e4c27050634d6;hpb=ecc54f11c258cad6b54d35da83e525d32c032397;p=babeltrace.git

diff --git a/formats/ctf/types/sequence.c b/formats/ctf/types/sequence.c
index 898c3672..518b13d5 100644
--- a/formats/ctf/types/sequence.c
+++ b/formats/ctf/types/sequence.c
@@ -37,7 +37,7 @@ int ctf_sequence_read(struct bt_stream_pos *ppos, struct bt_definition *definiti
 	struct bt_declaration *elem = sequence_declaration->elem;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 
-	if (elem->id == CTF_TYPE_INTEGER) {
+	if (elem->id == BT_CTF_TYPE_ID_INTEGER) {
 		struct declaration_integer *integer_declaration =
 			container_of(elem, struct declaration_integer, p);
 
@@ -48,14 +48,16 @@ int ctf_sequence_read(struct bt_stream_pos *ppos, struct bt_definition *definiti
 			    && integer_declaration->p.alignment == CHAR_BIT) {
 				uint64_t len = bt_sequence_len(sequence_definition);
 
-				ctf_align_pos(pos, integer_declaration->p.alignment);
+				if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+					return -EFAULT;
 				if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
 					return -EFAULT;
 
 				g_string_assign(sequence_definition->string, "");
 				g_string_insert_len(sequence_definition->string,
 					0, (char *) ctf_get_pos_addr(pos), len);
-				ctf_move_pos(pos, len * CHAR_BIT);
+				if (!ctf_move_pos(pos, len * CHAR_BIT))
+					return -EFAULT;
 				return 0;
 			}
 		}
@@ -72,7 +74,7 @@ int ctf_sequence_write(struct bt_stream_pos *ppos, struct bt_definition *definit
 	struct bt_declaration *elem = sequence_declaration->elem;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 
-	if (elem->id == CTF_TYPE_INTEGER) {
+	if (elem->id == BT_CTF_TYPE_ID_INTEGER) {
 		struct declaration_integer *integer_declaration =
 			container_of(elem, struct declaration_integer, p);
 
@@ -83,13 +85,15 @@ int ctf_sequence_write(struct bt_stream_pos *ppos, struct bt_definition *definit
 			    && integer_declaration->p.alignment == CHAR_BIT) {
 				uint64_t len = bt_sequence_len(sequence_definition);
 
-				ctf_align_pos(pos, integer_declaration->p.alignment);
+				if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+					return -EFAULT;
 				if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
 					return -EFAULT;
 
 				memcpy((char *) ctf_get_pos_addr(pos),
 					sequence_definition->string->str, len);
-				ctf_move_pos(pos, len * CHAR_BIT);
+				if (!ctf_move_pos(pos, len * CHAR_BIT))
+					return -EFAULT;
 				return 0;
 			}
 		}