X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=9ab5f77e0067b8f129b8ce4e17c2bba12d386f43;hp=9dbd49bc3fe5a2911e0516324824383f9257908a;hb=57703f6e0047955a0c68829630fcc42aad988a39;hpb=286c991af026bfd127e1de5f97976ff8b291721e

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 9dbd49bc3..9ab5f77e0 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1875,6 +1875,7 @@ static int create_ust_app_session(struct ltt_ust_session *usess,
 		/* Init local registry. */
 		ret = setup_buffer_reg_pid(ua_sess, app, NULL);
 		if (ret < 0) {
+			delete_ust_app_session(-1, ua_sess, app);
 			goto error;
 		}
 		break;
@@ -1882,6 +1883,7 @@ static int create_ust_app_session(struct ltt_ust_session *usess,
 		/* Look for a global registry. If none exists, create one. */
 		ret = setup_buffer_reg_uid(usess, app, NULL);
 		if (ret < 0) {
+			delete_ust_app_session(-1, ua_sess, app);
 			goto error;
 		}
 		break;
@@ -3436,11 +3438,21 @@ void ust_app_clean_list(void)
 /*
  * Init UST app hash table.
  */
-void ust_app_ht_alloc(void)
+int ust_app_ht_alloc(void)
 {
 	ust_app_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
+	if (!ust_app_ht) {
+		return -1;
+	}
 	ust_app_ht_by_sock = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
+	if (!ust_app_ht_by_sock) {
+		return -1;
+	}
 	ust_app_ht_by_notify_sock = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
+	if (!ust_app_ht_by_notify_sock) {
+		return -1;
+	}
+	return 0;
 }
 
 /*