From 8aca663cd2a1cc1680b18a349f7d8b9bef8ef490 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Mon, 20 Aug 2018 15:54:57 -0400 Subject: [PATCH] Fix: unchecked return value of cds_lfht_destroy MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The sessiond should assert that cds_lfht_destroy returns 0 when tearing down the 'pending rotate channel' hash table as a non-zero value would indicate a leak. Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/rotation-thread.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c index dcae248b4..24ab0c803 100644 --- a/src/bin/lttng-sessiond/rotation-thread.c +++ b/src/bin/lttng-sessiond/rotation-thread.c @@ -261,8 +261,11 @@ error: static void fini_thread_state(struct rotation_thread_state *state) { + int ret; + lttng_poll_clean(&state->events); - cds_lfht_destroy(channel_pending_rotate_ht, NULL); + ret = cds_lfht_destroy(channel_pending_rotate_ht, NULL); + assert(!ret); if (rotate_notification_channel) { lttng_notification_channel_destroy(rotate_notification_channel); } -- 2.34.1