field-types.c: check that we don't add self FT to struct/var FT

[babeltrace.git] / formats / ctf / ir / field-types.c

diff --git a/formats/ctf/ir/field-types.c b/formats/ctf/ir/field-types.c
index b6c2102fb08335d4cbd06d88925b8476c8081b9d..7f324c9a47b5c25f5a107e8e4bbf2bdf92e27392 100644 (file)
--- a/formats/ctf/ir/field-types.c
+++ b/formats/ctf/ir/field-types.c
@@ -270,6 +270,8 @@ int (* const type_compare_funcs[])(struct bt_ctf_field_type *,
        [BT_CTF_TYPE_ID_STRING] = bt_ctf_field_type_string_compare,
 };
 
+static
+int bt_ctf_field_type_integer_validate(struct bt_ctf_field_type *);
 static
 int bt_ctf_field_type_enumeration_validate(struct bt_ctf_field_type *);
 static
@@ -283,7 +285,7 @@ int bt_ctf_field_type_sequence_validate(struct bt_ctf_field_type *);
 
 static
 int (* const type_validate_funcs[])(struct bt_ctf_field_type *) = {
-       [BT_CTF_TYPE_ID_INTEGER] = NULL,
+       [BT_CTF_TYPE_ID_INTEGER] = bt_ctf_field_type_integer_validate,
        [BT_CTF_TYPE_ID_FLOAT] = NULL,
        [BT_CTF_TYPE_ID_STRING] = NULL,
        [BT_CTF_TYPE_ID_ENUM] = bt_ctf_field_type_enumeration_validate,
@@ -402,8 +404,8 @@ int add_structure_field(GPtrArray *fields,
        field->name = name_quark;
        field->type = field_type;
        g_hash_table_insert(field_name_to_index,
-               (gpointer) (unsigned long) name_quark,
-               (gpointer) (unsigned long) fields->len);
+               GUINT_TO_POINTER(name_quark),
+               GUINT_TO_POINTER(fields->len));
        g_ptr_array_add(fields, field);
 end:
        return ret;
@@ -425,6 +427,24 @@ void bt_ctf_field_type_destroy(struct bt_object *obj)
        type_destroy_funcs[type_id](type);
 }
 
+static
+int bt_ctf_field_type_integer_validate(struct bt_ctf_field_type *type)
+{
+       int ret = 0;
+
+       struct bt_ctf_field_type_integer *integer =
+               container_of(type, struct bt_ctf_field_type_integer,
+                       parent);
+
+       if (integer->mapped_clock && integer->declaration.signedness) {
+               ret = -1;
+               goto end;
+       }
+
+end:
+       return ret;
+}
+
 static
 int bt_ctf_field_type_enumeration_validate(struct bt_ctf_field_type *type)
 {
@@ -824,7 +844,7 @@ int bt_ctf_field_type_integer_set_mapped_clock(
        struct bt_ctf_field_type_integer *integer;
        int ret = 0;
 
-       if (!type || type->frozen) {
+       if (!type || type->frozen || !bt_ctf_clock_is_valid(clock)) {
                ret = -1;
                goto end;
        }
@@ -1390,9 +1410,14 @@ int bt_ctf_field_type_structure_add_field(struct bt_ctf_field_type *type,
        int ret = 0;
        struct bt_ctf_field_type_structure *structure;
 
+       /*
+        * TODO: check that `field_type` does not contain `type`,
+        *       recursively.
+        */
        if (!type || !field_type || type->frozen ||
                bt_ctf_validate_identifier(field_name) ||
-               (type->declaration->id != BT_CTF_TYPE_ID_STRUCT)) {
+               (type->declaration->id != BT_CTF_TYPE_ID_STRUCT) ||
+               type == field_type) {
                ret = -1;
                goto end;
        }
@@ -1595,9 +1620,14 @@ int bt_ctf_field_type_variant_add_field(struct bt_ctf_field_type *type,
        struct bt_ctf_field_type_variant *variant;
        GQuark field_name_quark = g_quark_from_string(field_name);
 
+       /*
+        * TODO: check that `field_type` does not contain `type`,
+        *       recursively.
+        */
        if (!type || !field_type || type->frozen ||
                bt_ctf_validate_identifier(field_name) ||
-               (type->declaration->id != BT_CTF_TYPE_ID_VARIANT)) {
+               (type->declaration->id != BT_CTF_TYPE_ID_VARIANT) ||
+               type == field_type) {
                ret = -1;
                goto end;
        }
@@ -2352,7 +2382,6 @@ void bt_ctf_field_type_set_native_byte_order(struct bt_ctf_field_type *type,
        }
 }
 
-BT_HIDDEN
 struct bt_ctf_field_type *bt_ctf_field_type_copy(struct bt_ctf_field_type *type)
 {
        struct bt_ctf_field_type *copy = NULL;
@@ -4043,9 +4072,15 @@ struct bt_ctf_field_type *bt_ctf_field_type_get_field_at_index(
                        index);
                break;
        case CTF_TYPE_VARIANT:
-               bt_ctf_field_type_variant_get_field(field_type, NULL,
+       {
+               int ret = bt_ctf_field_type_variant_get_field(field_type, NULL,
                        &field, index);
+               if (ret) {
+                       field = NULL;
+                       goto end;
+               }
                break;
+       }
        case CTF_TYPE_ARRAY:
                field = bt_ctf_field_type_array_get_element_type(field_type);
                break;
@@ -4055,7 +4090,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_get_field_at_index(
        default:
                break;
        }
-
+end:
        return field;
 }