X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=52d1da787f8142cd7cf92bab17acd9d3eda11235;hp=160f567c89b5c3ca755ef0735233c6b3a436a1d5;hb=2b2694892c10cdb632afac2b2f1aabf7cb9673d9;hpb=e098433c90550d74288498f8c4474ef4c2daea68

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 160f567c8..52d1da787 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -4446,6 +4446,7 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 					usess->consumer->dst.session_root_path,
 					usess->consumer->chunk_path,
 					usess->consumer->subdir);
+			free(tmp_path);
 			goto error_unlock;
 		}
 
@@ -5974,6 +5975,11 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
 			struct buffer_reg_channel *reg_chan;
 			struct consumer_socket *socket;
 
+			if (!reg->registry->reg.ust->metadata_key) {
+				/* Skip since no metadata is present */
+				continue;
+			}
+
 			/* Get consumer socket to use to push the metadata.*/
 			socket = consumer_find_socket_by_bitness(reg->bits_per_long,
 					usess->consumer);