Fix: bt_ctf_field_type_structure_add_field argument validation

bt_ctf_field_type_structure_add_field is not setting the return
value to a negative value if the parameter validation fails. The
function would abort while appearing to have succeeded.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c
index 48a2a746ad3c252fe952c746fa88dbd724c45d9a..7d01ce8b6535f1b7fa87d28329159b0242d2d1b0 100644 (file)
--- a/formats/ctf/ir/event-types.c
+++ b/formats/ctf/ir/event-types.c
@@ -1016,6 +1016,7 @@ int bt_ctf_field_type_structure_add_field(struct bt_ctf_field_type *type,
                validate_identifier(field_name) ||
                (type->declaration->id != CTF_TYPE_STRUCT) ||
                bt_ctf_field_type_validate(field_type)) {
+               ret = -1;
                goto end;
        }
 

diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
index 7720719e9074a6c86d54480e35edcb3af6df0d58..bbe354f2fe0ce938a9638b9f2151450ede48540c 100644 (file)
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -1219,7 +1219,7 @@ void type_field_tests()
        ok(!enumeration_array_type,
                "Check enumeration types are validated when creating an array");
        ok(bt_ctf_field_type_structure_add_field(composite_structure_type,
-               enumeration_type, "enumeration") == 0,
+               enumeration_type, "enumeration"),
                "Check enumeration types are validated when adding them as structure members");
        enumeration = bt_ctf_field_create(enumeration_type);
        ok(!enumeration,