X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.c;h=992ba586d3f1aac0154f879e67abc04cd2a4da92;hb=fd5f765ddad09f7f0395544bfa2b4ea5f624966a;hp=4d4094e7361836c5617e42eb61ecea84d56e1ba1;hpb=6e78b10e47913603de67e026a90aa592136392ef;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-registry.c b/src/bin/lttng-sessiond/ust-registry.c
index 4d4094e73..992ba586d 100644
--- a/src/bin/lttng-sessiond/ust-registry.c
+++ b/src/bin/lttng-sessiond/ust-registry.c
@@ -738,13 +738,16 @@ static void destroy_channel(struct ust_registry_channel *chan, bool notif)
 		}
 	}
 
-	rcu_read_lock();
-	/* Destroy all event associated with this registry. */
-	cds_lfht_for_each_entry(chan->ht->ht, &iter.iter, event, node.node) {
-		/* Delete the node from the ht and free it. */
-		ust_registry_destroy_event(chan, event);
+	if (chan->ht) {
+		rcu_read_lock();
+		/* Destroy all event associated with this registry. */
+		cds_lfht_for_each_entry(
+				chan->ht->ht, &iter.iter, event, node.node) {
+			/* Delete the node from the ht and free it. */
+			ust_registry_destroy_event(chan, event);
+		}
+		rcu_read_unlock();
 	}
-	rcu_read_unlock();
 	call_rcu(&chan->rcu_head, destroy_channel_rcu);
 }