Fix not NULL pointer on size 0

[lttng-tools.git] / lttng-sessiond / context.c

diff --git a/lttng-sessiond/context.c b/lttng-sessiond/context.c
index 41e33ec27634a56489be547ecff0b6e3381048d5..732dc929d55ca8a1fa81dcab50bc31dc438c5f80 100644 (file)
--- a/lttng-sessiond/context.c
+++ b/lttng-sessiond/context.c
@@ -25,14 +25,6 @@
 #include <lttng-sessiond-comm.h>
 #include <lttngerr.h>
 
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
-#include <ust/lttng-ust-ctl.h>
-#include <ust/lttng-ust-abi.h>
-#else
-#include "lttng-ust-ctl.h"
-#include "lttng-ust-abi.h"
-#endif
-
 #include "context.h"
 #include "hashtable.h"
 #include "kernel-ctl.h"
@@ -268,12 +260,14 @@ static int add_ustctx_all_channels(struct ltt_ust_session *ustsession,
                        //              ustctx, ustchan->obj, &context_data);
                        if (ret < 0) {
                                ret = LTTCOMM_UST_CONTEXT_FAIL;
+                               rcu_read_unlock();
                                goto error;
                        }
                } else {
                        ret = add_ustctx_to_event(ustsession, ustctx, ustchan, event_name);
                        if (ret < 0) {
                                ret = LTTCOMM_UST_CONTEXT_FAIL;
+                               rcu_read_unlock();
                                goto error;
                        } else if (ret == 1) {
                                /* Event found and context added */