X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Farray.c;h=016d527fb1b328cf81ba374521d38e7126a460ef;hb=9a19a512f564cbb301b0b5f1377d64e3b3f0a851;hp=ea3ecfd8a656d5db9b4f389ee1302b5b6b5926ca;hpb=ecc54f11c258cad6b54d35da83e525d32c032397;p=babeltrace.git

diff --git a/formats/ctf/types/array.c b/formats/ctf/types/array.c
index ea3ecfd8..016d527f 100644
--- a/formats/ctf/types/array.c
+++ b/formats/ctf/types/array.c
@@ -38,7 +38,7 @@ int ctf_array_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 	struct ctf_stream_pos *pos =
 		container_of(ppos, struct ctf_stream_pos, parent);
 
-	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,7 +48,8 @@ int ctf_array_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 			if (integer_declaration->len == CHAR_BIT
 			    && integer_declaration->p.alignment == CHAR_BIT) {
 
-				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, array_declaration->len * CHAR_BIT))
 					return -EFAULT;
 
@@ -56,8 +57,11 @@ int ctf_array_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 				g_string_insert_len(array_definition->string,
 					0, (char *) ctf_get_pos_addr(pos),
 					array_declaration->len);
-				ctf_move_pos(pos, array_declaration->len * CHAR_BIT);
-				return 0;
+				/*
+				 * We want to populate both the string
+				 * and the underlying values, so carry
+				 * on calling bt_array_rw().
+				 */
 			}
 		}
 	}
@@ -74,7 +78,7 @@ int ctf_array_write(struct bt_stream_pos *ppos, struct bt_definition *definition
 	struct ctf_stream_pos *pos =
 		container_of(ppos, struct ctf_stream_pos, parent);
 
-	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);
 
@@ -84,14 +88,16 @@ int ctf_array_write(struct bt_stream_pos *ppos, struct bt_definition *definition
 			if (integer_declaration->len == CHAR_BIT
 			    && integer_declaration->p.alignment == CHAR_BIT) {
 
-				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, array_declaration->len * CHAR_BIT))
 					return -EFAULT;
 
 				memcpy((char *) ctf_get_pos_addr(pos),
 					array_definition->string->str,
 					array_declaration->len);
-				ctf_move_pos(pos, array_declaration->len * CHAR_BIT);
+				if (!ctf_move_pos(pos, array_declaration->len * CHAR_BIT))
+					return -EFAULT;
 				return 0;
 			}
 		}