X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=c3f8ab3bdbc7dfb8aff2c5eca9b146276c6ac22d;hb=36134aa184c8ed8f67a197d66d1310425abbf1ce;hp=9527371380e02c45011ad60a0f806872e194a861;hpb=12744796179ed3bfa9c3b6e22bfdeabf2e6081bf;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 952737138..c3f8ab3bd 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -2895,6 +2895,7 @@ skip_domain:
 
 		ret = setup_lttng_msg(cmd_ctx, nb_dom * sizeof(struct lttng_domain));
 		if (ret < 0) {
+			free(domains);
 			goto setup_error;
 		}
 
@@ -2922,6 +2923,7 @@ skip_domain:
 
 		ret = setup_lttng_msg(cmd_ctx, nb_chan * sizeof(struct lttng_channel));
 		if (ret < 0) {
+			free(channels);
 			goto setup_error;
 		}
 
@@ -2949,6 +2951,7 @@ skip_domain:
 
 		ret = setup_lttng_msg(cmd_ctx, nb_event * sizeof(struct lttng_event));
 		if (ret < 0) {
+			free(events);
 			goto setup_error;
 		}
 
@@ -3446,13 +3449,11 @@ static void *thread_manage_clients(void *data)
 		ret = process_client_msg(cmd_ctx, sock, &sock_error);
 		rcu_thread_offline();
 		if (ret < 0) {
-			if (sock_error) {
-				ret = close(sock);
-				if (ret) {
-					PERROR("close");
-				}
-				sock = -1;
+			ret = close(sock);
+			if (ret) {
+				PERROR("close");
 			}
+			sock = -1;
 			/*
 			 * TODO: Inform client somehow of the fatal error. At
 			 * this point, ret < 0 means that a zmalloc failed