X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=c09c0c52582a45e03e5d7e292167bc907ff3bde6;hp=ebbe5e3930af3ea8b559054fdab8cbdc3d3eab6a;hb=e986c7a156b09ae5b3333c5677a341cabf9e25d3;hpb=33832e643df265121266c16fd5dc54313e86e20f diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c index ebbe5e393..c09c0c525 100644 --- a/src/bin/lttng-relayd/main.c +++ b/src/bin/lttng-relayd/main.c @@ -1176,6 +1176,8 @@ static int write_padding_to_file(int fd, uint32_t size) PERROR("write padding to file"); } + free(zeros); + end: return ret; } @@ -1208,9 +1210,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 +1487,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; }