X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=9e6d4bf9fa594dc2f51e93ee2f918360acf994c8;hp=ebbe5e3930af3ea8b559054fdab8cbdc3d3eab6a;hb=d7b3776ffb1bef894e7bc4cbfe45c5c2d58b8600;hpb=4e9a468645939ea62541fa802893b928b01888b7

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index ebbe5e393..9e6d4bf9f 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -1208,9 +1208,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 +1485,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;
 		}