X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=a398a54dc6611725361c683ef6b288d2de4d48e5;hb=9449cc7574c27419ac4424b4653a6f4428d01b4d;hp=ebbe5e3930af3ea8b559054fdab8cbdc3d3eab6a;hpb=33832e643df265121266c16fd5dc54313e86e20f;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index ebbe5e393..a398a54dc 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -241,6 +241,9 @@ void cleanup(void)
 
 	/* Close relay cmd pipes */
 	utils_close_pipe(relay_cmd_pipe);
+
+	uri_free(control_uri);
+	uri_free(data_uri);
 }
 
 /*
@@ -884,7 +887,8 @@ void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht
 	}
 
 	DBG("Relay deleting session %" PRIu64, cmd->session->id);
-	free(cmd->session->sock);
+
+	lttcomm_destroy_sock(cmd->session->sock);
 
 	rcu_read_lock();
 	cds_lfht_for_each_entry(streams_ht->ht, &iter.iter, node, node) {
@@ -902,6 +906,8 @@ void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht
 		}
 	}
 	rcu_read_unlock();
+
+	free(cmd->session);
 }
 
 /*
@@ -1176,6 +1182,8 @@ static int write_padding_to_file(int fd, uint32_t size)
 		PERROR("write padding to file");
 	}
 
+	free(zeros);
+
 end:
 	return ret;
 }
@@ -1208,9 +1216,12 @@ int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
 	payload_size -= sizeof(struct lttcomm_relayd_metadata_payload);
 
 	if (data_buffer_size < data_size) {
+		/* In case the realloc fails, we can free the memory */
+		char *tmp_data_ptr = data_buffer;
 		data_buffer = realloc(data_buffer, data_size);
 		if (!data_buffer) {
 			ERR("Allocating data buffer");
+			free(tmp_data_ptr);
 			ret = -1;
 			goto end;
 		}
@@ -1482,9 +1493,11 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
 
 	data_size = be32toh(data_hdr.data_size);
 	if (data_buffer_size < data_size) {
+		char *tmp_data_ptr = data_buffer;
 		data_buffer = realloc(data_buffer, data_size);
 		if (!data_buffer) {
 			ERR("Allocating data buffer");
+			free(tmp_data_ptr);
 			ret = -1;
 			goto end_unlock;
 		}
@@ -1592,6 +1605,8 @@ void deferred_free_connection(struct rcu_head *head)
 {
 	struct relay_command *relay_connection =
 		caa_container_of(head, struct relay_command, rcu_node);
+
+	lttcomm_destroy_sock(relay_connection->sock);
 	free(relay_connection);
 }
 
@@ -1607,6 +1622,7 @@ void relay_del_connection(struct lttng_ht *relay_connections_ht,
 	if (relay_connection->type == RELAY_CONTROL) {
 		relay_delete_session(relay_connection, streams_ht);
 	}
+
 	call_rcu(&relay_connection->rcu_node,
 		deferred_free_connection);
 }