X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.c;h=c321ae41f0987c42a308ba3311b381eb4237ceff;hb=47b7e2f9d1199c32f87138f4c226e9c5153c7968;hp=45a3045ddfe57f57faea2973e46021fc7e34a68c;hpb=6a4e403927ffef4cae8726064dcf53c463eb128c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index 45a3045dd..c321ae41f 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -494,11 +494,14 @@ error:
 int agent_disable_event(struct agent_event *event,
 		enum lttng_domain_type domain)
 {
-	int ret;
+	int ret = LTTNG_OK;
 	struct agent_app *app;
 	struct lttng_ht_iter iter;
 
 	assert(event);
+	if (!event->enabled) {
+		goto end;
+	}
 
 	rcu_read_lock();
 
@@ -516,10 +519,10 @@ int agent_disable_event(struct agent_event *event,
 	}
 
 	event->enabled = 0;
-	ret = LTTNG_OK;
 
 error:
 	rcu_read_unlock();
+end:
 	return ret;
 }
 
@@ -1009,6 +1012,9 @@ void agent_app_ht_clean(void)
 	struct lttng_ht_node_ulong *node;
 	struct lttng_ht_iter iter;
 
+	if (!agent_apps_ht_by_sock) {
+		return;
+	}
 	rcu_read_lock();
 	cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, node, node) {
 		struct agent_app *app;