Fix: release reference to ltt_session on error instead of free()

[lttng-tools.git] / src / bin / lttng-sessiond / session.c

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index e7967f45ef3bafe3c990dbd0521f60c01dd5b828..5e6488e4f28c67a98fc3bdf9cb1459fedde50fc3 100644 (file)
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -444,10 +444,12 @@ void session_release(struct urcu_ref *ref)
        consumer_output_put(session->consumer);
        snapshot_destroy(&session->snapshot);
 
        consumer_output_put(session->consumer);
        snapshot_destroy(&session->snapshot);
 

-       ASSERT_LOCKED(ltt_session_list.lock);
-       del_session_list(session);
-       del_session_ht(session);
-       pthread_cond_broadcast(&ltt_session_list.removal_cond);
+       if (session->published) {
+               ASSERT_LOCKED(ltt_session_list.lock);
+               del_session_list(session);
+               del_session_ht(session);
+               pthread_cond_broadcast(&ltt_session_list.removal_cond);
+       }

        free(session);
 }
 
        free(session);
 }
 


@@ -630,6 +632,7 @@ int session_create(char *name, uid_t uid, gid_t gid)
         * by session id.
         */
        add_session_ht(new_session);
         * by session id.
         */
        add_session_ht(new_session);

+       new_session->published = true;

        session_unlock_list();
 
        /*
        session_unlock_list();
 
        /*


@@ -643,7 +646,9 @@ int session_create(char *name, uid_t uid, gid_t gid)
 
 error:
 error_asprintf:
 
 error:
 error_asprintf:

-       free(new_session);
+       session_lock_list();
+       session_put(new_session);
+       session_unlock_list();

 
 error_malloc:
        return ret;
 
 error_malloc:
        return ret;