Fix: remove invalid free

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

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 61245a88dfcc2cd18b2163e8016b199e6a26d2d5..45ec1c776a33828dcbfbdb696182cd0e9cb291ee 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -185,6 +185,7 @@ static
 void objd_ref(int id)
 {
        struct lttng_ust_obj *obj = _objd_get(id);
+       assert(obj != NULL);
        obj->u.s.f_count++;
 }
 
@@ -334,9 +335,10 @@ long lttng_abi_tracer_version(int objd,
 static
 long lttng_abi_add_context(int objd,
        struct lttng_ust_context *context_param,
+       union ust_args *uargs,
        struct lttng_ctx **ctx, struct lttng_session *session)
 {
-       return lttng_attach_context(context_param, ctx, session);
+       return lttng_attach_context(context_param, uargs, ctx, session);
 }
 
 /**
@@ -466,8 +468,6 @@ int lttng_abi_map_channel(int session_objd,
                chan_name = "channel";
                break;
        default:
-               transport_name = "<unknown>";
-               chan_name = "<unknown>";
                ret = -EINVAL;
                goto notransport;
        }
@@ -513,7 +513,6 @@ int lttng_abi_map_channel(int session_objd,
        /* error path after channel was created */
 objd_error:
 notransport:
-       free(lttng_chan);
 alloc_error:
        channel_destroy(chan, channel_handle, 0);
        return ret;
@@ -886,7 +885,7 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
        }
        case LTTNG_UST_CONTEXT:
                return lttng_abi_add_context(objd,
-                               (struct lttng_ust_context *) arg,
+                               (struct lttng_ust_context *) arg, uargs,
                                &channel->ctx, channel->session);
        case LTTNG_UST_ENABLE:
                return lttng_channel_enable(channel);
@@ -988,6 +987,8 @@ static const struct lttng_ust_objd_ops lttng_enabler_ops = {
 void lttng_ust_abi_exit(void)
 {
        lttng_ust_abi_close_in_progress = 1;
+       ust_lock_nocheck();
        objd_table_destroy();
+       ust_unlock();
        lttng_ust_abi_close_in_progress = 0;
 }