[lttng-dev] [PATCH lttng-tools] Fix: Move initialization of queue_pipe_fd after null check of handle
Jonathan Rajotte
jonathan.rajotte-julien at efficios.com
Fri Sep 20 11:07:55 EDT 2019
Fixes coverity #1399732
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
---
src/bin/lttng-sessiond/rotation-thread.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 7bd6c6819..1ee3974f0 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -832,8 +832,6 @@ void *thread_rotation(void *data)
int ret;
struct rotation_thread_handle *handle = data;
struct rotation_thread thread;
- const int queue_pipe_fd = lttng_pipe_get_readfd(
- handle->rotation_timer_queue->event_pipe);
DBG("[rotation-thread] Started rotation thread");
@@ -842,6 +840,10 @@ void *thread_rotation(void *data)
goto end;
}
+ /* Must be after null checking of handle for const assignment */
+ const int queue_pipe_fd = lttng_pipe_get_readfd(
+ handle->rotation_timer_queue->event_pipe);
+
rcu_register_thread();
rcu_thread_online();
--
2.17.1
More information about the lttng-dev
mailing list