X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Farray.c;h=979f7a3dc313895d29085e6de09e7ad904b675c0;hp=04801d4f05455df71160f85b4cd0ed6d58c9d180;hb=024e61817685a20caceb4e3ef3bdc019a7af6b6e;hpb=13ec125abb88a60fc5e11ff904b525e1f00a331b

diff --git a/formats/ctf/types/array.c b/formats/ctf/types/array.c
index 04801d4f..979f7a3d 100644
--- a/formats/ctf/types/array.c
+++ b/formats/ctf/types/array.c
@@ -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,6 +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);
+				/*
+				 * We want to populate both the string
+				 * and the underlying values, so carry
+				 * on calling bt_array_rw().
+				 */
 			}
 		}
 	}
@@ -82,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;
 			}
 		}