Fix: sessiond: Dereference before null check

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

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 2b44036a2276c224b108fd26760d3063770660c9..ee25baaf1964d8d5a1809a2e1bfc53f5f723d1df 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -467,6 +467,11 @@ int check_session_rotation_pending(struct ltt_session *session,
        const char *archived_chunk_name;
        uint64_t chunk_being_archived_id;
 
+       if (!session->chunk_being_archived) {
+               ret = 0;
+               goto end;
+       }
+
        chunk_status = lttng_trace_chunk_get_id(session->chunk_being_archived,
                        &chunk_being_archived_id);
        assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
@@ -474,11 +479,6 @@ int check_session_rotation_pending(struct ltt_session *session,
        DBG("[rotation-thread] Checking for pending rotation on session \"%s\", trace archive %" PRIu64,
                        session->name, chunk_being_archived_id);
 
-       if (!session->chunk_being_archived) {
-               ret = 0;
-               goto end;
-       }
-
        /*
         * The rotation-pending check timer of a session is launched in
         * one-shot mode. If the rotation is incomplete, the rotation
@@ -489,14 +489,14 @@ int check_session_rotation_pending(struct ltt_session *session,
         */
        ret = timer_session_rotation_pending_check_stop(session);
        if (ret) {
-               goto end;
+               goto check_ongoing_rotation;
        }
 
        check_session_rotation_pending_on_consumers(session,
                        &rotation_completed);
        if (!rotation_completed ||
                        session->rotation_state == LTTNG_ROTATION_STATE_ERROR) {
-               goto end;
+               goto check_ongoing_rotation;
        }
 
        /*
@@ -562,7 +562,7 @@ int check_session_rotation_pending(struct ltt_session *session,
        }
 
        ret = 0;
-end:
+check_ongoing_rotation:
        if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
                uint64_t chunk_being_archived_id;
 
@@ -582,6 +582,7 @@ end:
                }
        }
 
+end:
        return ret;
 }