X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=12b7b74f6d8ad7cc5d43799396ee4ba27d456bc2;hb=2a3a1a2bd63abbcfa53002e86e4be111783a9caa;hp=cbd9e9cc70bc8733e7f82dc59d21b29651524ae2;hpb=64e2c0ed5db412b9b3ecced98c7875bf3da0c08f;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index cbd9e9cc7..12b7b74f6 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -230,7 +230,7 @@ static int set_option(int opt, const char *arg, const char *optname)
 
 			errno = 0;
 			v = strtoul(arg, NULL, 0);
-			if (errno != 0 || !isdigit(arg[0])) {
+			if (errno != 0 || !isdigit((unsigned char) arg[0])) {
 				ERR("Wrong value in --fd-pool-size parameter: %s", arg);
 				ret = -1;
 				goto end;
@@ -1022,7 +1022,11 @@ static struct lttcomm_sock *relay_socket_create(struct lttng_uri *uri,
 	ret = fd_tracker_open_unsuspendable_fd(the_fd_tracker, &sock_fd,
 			(const char **) (formated_name ? &formated_name : NULL),
 			1, create_sock, sock);
-	free(formated_name);
+	if (ret) {
+		PERROR("Failed to open \"%s\" relay socket",
+				formated_name ?: "Unknown");
+		goto error;
+	}
 	DBG("Listening on %s socket %d", name, sock->fd);
 
 	ret = sock->ops->bind(sock);
@@ -1037,12 +1041,14 @@ static struct lttcomm_sock *relay_socket_create(struct lttng_uri *uri,
 
 	}
 
+	free(formated_name);
 	return sock;
 
 error:
 	if (sock) {
 		lttcomm_destroy_sock(sock);
 	}
+	free(formated_name);
 	return NULL;
 }