X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=1736a3e851b20b646aa0f0b95c8e65c3ddc67fd6;hp=07c75031a63e493821ee688faca8951ba3501754;hb=f2a444f17e07f805109c01ab4c7f53cc98b1adf3;hpb=821fffb2f13c9d5178df306f3c87edbeaf881a22

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 07c75031a..1736a3e85 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2610,10 +2610,8 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess,
 	ret = ust_consumer_ask_channel(ua_sess, metadata, consumer, socket,
 			registry);
 	if (ret < 0) {
-		/*
-		 * Safe because the metadata obj pointer is not set so the delete below
-		 * will not put a FD back again.
-		 */
+		/* Nullify the metadata key so we don't try to close it later on. */
+		registry->metadata_key = 0;
 		goto error_consumer;
 	}
 
@@ -2625,10 +2623,8 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess,
 	 */
 	ret = consumer_setup_metadata(socket, metadata->key);
 	if (ret < 0) {
-		/*
-		 * Safe because the metadata obj pointer is not set so the delete below
-		 * will not put a FD back again.
-		 */
+		/* Nullify the metadata key so we don't try to close it later on. */
+		registry->metadata_key = 0;
 		goto error_consumer;
 	}