Fix: array and sequence field's 'elems' members can be left NULL

[babeltrace.git] / formats / ctf / types / array.c

diff --git a/formats/ctf/types/array.c b/formats/ctf/types/array.c
index b1cbe2ffc77748a3e7389217ea495857e0faae87..23413dd1e8b4d780f49018fca2521c69ebd7c889 100644 (file)
--- a/formats/ctf/types/array.c
+++ b/formats/ctf/types/array.c
@@ -28,13 +28,13 @@
 
 #include <babeltrace/ctf/types.h>
 
-int ctf_array_read(struct bt_stream_pos *ppos, struct definition *definition)
+int ctf_array_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
        struct definition_array *array_definition =
                container_of(definition, struct definition_array, p);
        struct declaration_array *array_declaration =
                array_definition->declaration;
-       struct declaration *elem = array_declaration->elem;
+       struct bt_declaration *elem = array_declaration->elem;
        struct ctf_stream_pos *pos =
                container_of(ppos, struct ctf_stream_pos, parent);
 
@@ -42,35 +42,33 @@ int ctf_array_read(struct bt_stream_pos *ppos, struct definition *definition)
                struct declaration_integer *integer_declaration =
                        container_of(elem, struct declaration_integer, p);
 
-               if (integer_declaration->encoding == CTF_STRING_UTF8
-                     || integer_declaration->encoding == CTF_STRING_ASCII) {
+               if (bt_int_is_char(elem)) {
+                       if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+                               return -EFAULT;
+                       if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
+                               return -EFAULT;
 
-                       if (integer_declaration->len == CHAR_BIT
-                           && integer_declaration->p.alignment == CHAR_BIT) {
-
-                               ctf_align_pos(pos, integer_declaration->p.alignment);
-                               if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
-                                       return -EFAULT;
-
-                               g_string_assign(array_definition->string, "");
-                               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;
-                       }
+                       g_string_assign(array_definition->string, "");
+                       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().
+                        */
                }
        }
        return bt_array_rw(ppos, definition);
 }
 
-int ctf_array_write(struct bt_stream_pos *ppos, struct definition *definition)
+int ctf_array_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
        struct definition_array *array_definition =
                container_of(definition, struct definition_array, p);
        struct declaration_array *array_declaration =
                array_definition->declaration;
-       struct declaration *elem = array_declaration->elem;
+       struct bt_declaration *elem = array_declaration->elem;
        struct ctf_stream_pos *pos =
                container_of(ppos, struct ctf_stream_pos, parent);
 
@@ -78,22 +76,18 @@ int ctf_array_write(struct bt_stream_pos *ppos, struct definition *definition)
                struct declaration_integer *integer_declaration =
                        container_of(elem, struct declaration_integer, p);
 
-               if (integer_declaration->encoding == CTF_STRING_UTF8
-                     || integer_declaration->encoding == CTF_STRING_ASCII) {
-
-                       if (integer_declaration->len == CHAR_BIT
-                           && integer_declaration->p.alignment == CHAR_BIT) {
-
-                               ctf_align_pos(pos, integer_declaration->p.alignment);
-                               if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
-                                       return -EFAULT;
+               if (bt_int_is_char(elem)) {
+                       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);
-                               return 0;
-                       }
+                       memcpy((char *) ctf_get_pos_addr(pos),
+                               array_definition->string->str,
+                               array_declaration->len);
+                       if (!ctf_move_pos(pos, array_declaration->len * CHAR_BIT))
+                               return -EFAULT;
+                       return 0;
                }
        }
        return bt_array_rw(ppos, definition);