X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsave.c;h=22fab9c05bd013020a83c368fc6a0cadf7ad09e3;hb=db47121890a96d48c3ad09d83fca41cecd06e555;hp=0c91239931ad6125049687ea411fad8c52bddea7;hpb=d2992717e6c3df45a80c8529e50ab18b4415a0ac;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index 0c9123993..22fab9c05 100644
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -1239,6 +1239,7 @@ end_net_output:
 			ret = !output->dst.net.control_isset ?
 				LTTNG_ERR_URL_CTRL_MISS :
 				LTTNG_ERR_URL_DATA_MISS;
+			free(uri);
 			goto end;
 		}
 
@@ -1397,6 +1398,7 @@ int save_session(struct ltt_session *session,
 	struct lttng_save_session_attr *attr, lttng_sock_cred *creds)
 {
 	int ret, fd;
+	unsigned int file_opened = 0;	/* Indicate if the file has been opened */
 	char config_file_path[PATH_MAX];
 	size_t len;
 	struct config_writer *writer = NULL;
@@ -1484,6 +1486,7 @@ int save_session(struct ltt_session *session,
 		ret = LTTNG_ERR_SAVE_IO_FAIL;
 		goto end;
 	}
+	file_opened = 1;
 
 	writer = config_writer_create(fd);
 	if (!writer) {
@@ -1578,7 +1581,7 @@ end:
 	}
 	if (ret) {
 		/* Delete file in case of error */
-		if (unlink(config_file_path)) {
+		if (file_opened && unlink(config_file_path)) {
 			PERROR("Unlinking XML session configuration.");
 		}
 	}