Fix: memory leak in apply_context_reloc

[deliverable/lttng-ust.git] / liblttng-ust / lttng-bytecode.c

diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c
index a6527ff191e1a34f706933523a1248c48d4c2321..a30dd1825cec23e021ec1590d198d5d889feb990 100644 (file)
--- a/liblttng-ust/lttng-bytecode.c
+++ b/liblttng-ust/lttng-bytecode.c
@@ -298,21 +298,21 @@ int apply_context_reloc(struct bytecode_runtime *runtime,
        struct load_op *op;
        struct lttng_ctx_field *ctx_field;
        int idx;
-       struct lttng_ctx *ctx = *runtime->p.pctx;
+       struct lttng_ctx **pctx = runtime->p.pctx;
 
        dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name);
 
        /* Get context index */
-       idx = lttng_get_context_index(ctx, context_name);
+       idx = lttng_get_context_index(*pctx, context_name);
        if (idx < 0) {
                if (lttng_context_is_app(context_name)) {
                        int ret;
 
                        ret = lttng_ust_add_app_context_to_ctx_rcu(context_name,
-                                       &ctx);
+                                       pctx);
                        if (ret)
                                return ret;
-                       idx = lttng_get_context_index(ctx, context_name);
+                       idx = lttng_get_context_index(*pctx, context_name);
                        if (idx < 0)
                                return -ENOENT;
                } else {
@@ -324,7 +324,7 @@ int apply_context_reloc(struct bytecode_runtime *runtime,
                return -EINVAL;
 
        /* Get context return type */
-       ctx_field = &ctx->fields[idx];
+       ctx_field = &(*pctx)->fields[idx];
        op = (struct load_op *) &runtime->code[reloc_offset];
 
        switch (bytecode_op) {
@@ -483,6 +483,9 @@ int link_bytecode(const struct lttng_event_desc *event_desc,
        case LTTNG_UST_BYTECODE_NODE_TYPE_FILTER:
                runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret;
                break;
+       case LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE:
+               runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret;
+               break;
        default:
                abort();
        }
@@ -497,6 +500,9 @@ link_error:
        case LTTNG_UST_BYTECODE_NODE_TYPE_FILTER:
                runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret_false;
                break;
+       case LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE:
+               runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
+               break;
        default:
                abort();
        }
@@ -518,6 +524,16 @@ void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime)
                runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret;
 }
 
+void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime)
+{
+       struct lttng_ust_bytecode_node *bc = runtime->bc;
+
+       if (!bc->enabler->enabled || runtime->link_failed)
+               runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
+       else
+               runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret;
+}
+
 /*
  * Given the lists of bytecode programs of an instance (trigger or event) and
  * of a matching enabler, try to link all the enabler's bytecode programs with