Fix: Incorrect variant tag validation

[babeltrace.git] / formats / ctf / writer / event-fields.c

diff --git a/formats/ctf/writer/event-fields.c b/formats/ctf/writer/event-fields.c
index c2ad4c2447537b2370823b21f5dee2f238e53f58..461888f9b09498e0ea558d9b39b2ccd3aa46ce7f 100644 (file)
--- a/formats/ctf/writer/event-fields.c
+++ b/formats/ctf/writer/event-fields.c
@@ -445,7 +445,7 @@ struct bt_ctf_field *bt_ctf_field_variant_get_field(struct bt_ctf_field *field,
        tag_enum_integer = container_of(tag_enum, struct bt_ctf_field_integer,
                parent);
 
-       if (!bt_ctf_field_validate(variant->tag)) {
+       if (bt_ctf_field_validate(tag_field) < 0) {
                goto end;
        }
 
@@ -941,7 +941,7 @@ void bt_ctf_field_string_destroy(struct bt_ctf_field *field)
 static
 int bt_ctf_field_generic_validate(struct bt_ctf_field *field)
 {
-       return !(field && field->payload_set);
+       return (field && field->payload_set) ? 0 : -1;
 }
 
 static