Fix: properly compare type enumeration

Fixes: fead3a9cead4 ("Fix: bytecode linker: validate event and field array/sequence encoding")
Fixes: #1304
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I9b5e3df5415d56420365997ce289be7e02a0140e

diff --git a/lttng-filter.c b/lttng-filter.c
index c33fa5f281c77be6714be9ecbfe85b2a2c0787cc..05ce683ee72121a659cf620dcca2c3dcefb593c2 100644 (file)
--- a/lttng-filter.c
+++ b/lttng-filter.c
@@ -244,7 +244,7 @@ int apply_field_reloc(struct lttng_event *event,
                {
                        const struct lttng_basic_type *elem_type = &field->type.u.array.elem_type;
 
-                       if (elem_type != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+                       if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
                                return -EINVAL;
                        if (field->user)
                                op->op = FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE;
@@ -256,7 +256,7 @@ int apply_field_reloc(struct lttng_event *event,
                {
                        const struct lttng_basic_type *elem_type = &field->type.u.sequence.elem_type;
 
-                       if (elem_type != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+                       if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
                                return -EINVAL;
                        if (field->user)
                                op->op = FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE;
@@ -332,7 +332,7 @@ int apply_context_reloc(struct lttng_event *event,
                {
                        const struct lttng_basic_type *elem_type = &ctx_field->event_field.type.u.array.elem_type;
 
-                       if (elem_type != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+                       if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
                                return -EINVAL;
                        BUG_ON(ctx_field->event_field.user);
                        op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
@@ -342,7 +342,7 @@ int apply_context_reloc(struct lttng_event *event,
                {
                        const struct lttng_basic_type *elem_type = &ctx_field->event_field.type.u.sequence.elem_type;
 
-                       if (elem_type != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+                       if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
                                return -EINVAL;
                        BUG_ON(ctx_field->event_field.user);
                        op->op = FILTER_OP_GET_CONTEXT_REF_STRING;