X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fsequence.c;h=5dae7d0281d4610c586d00b2ee487e8ddb5a063d;hp=53ebf75c30eec90f36d0c677f4ad98b5caa6bbc6;hb=70fd5a515016525961d4bef0d627616abdc9bc28;hpb=0d69b916c5ba44b63a26aa038d416d6ee286306b

diff --git a/formats/ctf/types/sequence.c b/formats/ctf/types/sequence.c
index 53ebf75c..5dae7d02 100644
--- a/formats/ctf/types/sequence.c
+++ b/formats/ctf/types/sequence.c
@@ -34,7 +34,7 @@ int ctf_sequence_read(struct bt_stream_pos *ppos, struct bt_definition *definiti
 		container_of(definition, struct definition_sequence, p);
 	struct declaration_sequence *sequence_declaration =
 		sequence_definition->declaration;
-	struct declaration *elem = sequence_declaration->elem;
+	struct bt_declaration *elem = sequence_declaration->elem;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 
 	if (elem->id == CTF_TYPE_INTEGER) {
@@ -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;
 			}
 		}
@@ -69,7 +71,7 @@ int ctf_sequence_write(struct bt_stream_pos *ppos, struct bt_definition *definit
 		container_of(definition, struct definition_sequence, p);
 	struct declaration_sequence *sequence_declaration =
 		sequence_definition->declaration;
-	struct declaration *elem = sequence_declaration->elem;
+	struct bt_declaration *elem = sequence_declaration->elem;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 
 	if (elem->id == CTF_TYPE_INTEGER) {
@@ -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;
 			}
 		}