X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=1d48002d07297dad4ff88f8903c3d9ab422416b6;hp=c8b3b72f91ca3343a9a507dd343d5447ea6eb323;hb=af061a47af03a507bb9c2fade8f278a2a01fe29c;hpb=d4018451a4eb6c042b5ab5bb20c6ef0f812dc887

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index c8b3b72f9..1d48002d0 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -250,6 +250,10 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 	lttng_ht_node_init_str(&lue->node, lue->attr.name);
 	/* Alloc context hash tables */
 	lue->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
+	if (lue->ctx == NULL) {
+		ERR("Unable to create context hash table for event %s", ev->name);
+		goto error_free_event;
+	}
 
 	DBG2("Trace UST event %s, loglevel (%d,%d) created",
 		lue->attr.name, lue->attr.loglevel_type,
@@ -258,7 +262,6 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 	return lue;
 
 error_free_event:
-	lttng_ht_destroy(lue->ctx);
 	free(lue);
 error:
 	return NULL;