Fix: accept 65536 bytes long bytecodes

[lttng-ust.git] / liblttng-ust / lttng-filter.c

diff --git a/liblttng-ust/lttng-filter.c b/liblttng-ust/lttng-filter.c
index d5b2e2077a8aad11d211c7680c6b153ecde2a167..68a5931158140ec735fb67ccacee9a71958407bb 100644 (file)
--- a/liblttng-ust/lttng-filter.c
+++ b/liblttng-ust/lttng-filter.c
@@ -71,6 +71,20 @@ static const char *opnames[] = {
        [ FILTER_OP_GE_DOUBLE ] = "GE_DOUBLE",
        [ FILTER_OP_LE_DOUBLE ] = "LE_DOUBLE",
 
+       /* Mixed S64-double binary comparators */
+       [ FILTER_OP_EQ_DOUBLE_S64 ] = "EQ_DOUBLE_S64",
+       [ FILTER_OP_NE_DOUBLE_S64 ] = "NE_DOUBLE_S64",
+       [ FILTER_OP_GT_DOUBLE_S64 ] = "GT_DOUBLE_S64",
+       [ FILTER_OP_LT_DOUBLE_S64 ] = "LT_DOUBLE_S64",
+       [ FILTER_OP_GE_DOUBLE_S64 ] = "GE_DOUBLE_S64",
+       [ FILTER_OP_LE_DOUBLE_S64 ] = "LE_DOUBLE_S64",
+
+       [ FILTER_OP_EQ_S64_DOUBLE ] = "EQ_S64_DOUBLE",
+       [ FILTER_OP_NE_S64_DOUBLE ] = "NE_S64_DOUBLE",
+       [ FILTER_OP_GT_S64_DOUBLE ] = "GT_S64_DOUBLE",
+       [ FILTER_OP_LT_S64_DOUBLE ] = "LT_S64_DOUBLE",
+       [ FILTER_OP_GE_S64_DOUBLE ] = "GE_S64_DOUBLE",
+       [ FILTER_OP_LE_S64_DOUBLE ] = "LE_S64_DOUBLE",
 
        /* unary */
        [ FILTER_OP_UNARY_PLUS ] = "UNARY_PLUS",
@@ -170,7 +184,7 @@ int apply_field_reloc(struct ltt_event *event,
                return -EINVAL;
 
        /* Check if field offset is too large for 16-bit offset */
-       if (field_offset > FILTER_BYTECODE_MAX_LEN)
+       if (field_offset > FILTER_BYTECODE_MAX_LEN - 1)
                return -EINVAL;
 
        /* set type */
@@ -277,7 +291,7 @@ void lttng_filter_event_link_bytecode(struct ltt_event *event,
 
        ret = _lttng_filter_event_link_bytecode(event, filter_bytecode);
        if (ret) {
-               fprintf(stderr, "[lttng filter] error linking event bytecode\n");
+               dbg_printf("[lttng filter] warning: cannot link event bytecode\n");
        }
 }