X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Flttng-ctl%2Flttng-ctl-health.c;h=dc1516db5d0c7336371e10f0408927eef34a949e;hb=e1b624d005769d1a2e9eb39fee63c73c6395fd76;hp=91108c166b9825227248fa1e7bb00ce59b7ea7c5;hpb=d1ba29d290281cf72ca3ec7b0222b336c747e925;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl-health.c b/src/lib/lttng-ctl/lttng-ctl-health.c
index 91108c166..dc1516db5 100644
--- a/src/lib/lttng-ctl/lttng-ctl-health.c
+++ b/src/lib/lttng-ctl/lttng-ctl-health.c
@@ -15,7 +15,6 @@
 #include <sys/types.h>
 #include <stdint.h>
 #include <limits.h>
-#include <errno.h>
 #include <string.h>
 #include <lttng/health-internal.h>
 
@@ -24,6 +23,7 @@
 #include <bin/lttng-relayd/health-relayd.h>
 #include <common/defaults.h>
 #include <common/utils.h>
+#include <common/compat/errno.h>
 
 #include "lttng-ctl-helper.h"
 
@@ -94,7 +94,7 @@ const char **thread_name[NR_HEALTH_COMPONENT] = {
 /*
  * Set health socket path.
  *
- * Returns 0 on success or -ENOMEM.
+ * Returns 0 on success or a negative errno.
  */
 static
 int set_health_socket_path(struct lttng_health *lh,
@@ -143,10 +143,10 @@ int set_health_socket_path(struct lttng_health *lh,
 	uid = getuid();
 
 	if (uid == 0 || tracing_group) {
-		lttng_ctl_copy_string(lh->health_sock_path,
+		ret = lttng_strncpy(lh->health_sock_path,
 				global_str,
 				sizeof(lh->health_sock_path));
-		return 0;
+		return ret == 0 ? 0 : -EINVAL;
 	}
 
 	/*
@@ -218,20 +218,30 @@ struct lttng_health *
 
 struct lttng_health *lttng_health_create_relayd(const char *path)
 {
-	struct lttng_health *lh;
+	int ret;
+	struct lttng_health *lh = NULL;
 
 	if (!path) {
-		return NULL;
+		goto error;
 	}
 
 	lh = lttng_health_create(HEALTH_COMPONENT_RELAYD,
 			NR_HEALTH_RELAYD_TYPES);
 	if (!lh) {
-		return NULL;
+		goto error;
 	}
-	lttng_ctl_copy_string(lh->health_sock_path, path,
-		sizeof(lh->health_sock_path));
+
+	ret = lttng_strncpy(lh->health_sock_path, path ?: "",
+			    sizeof(lh->health_sock_path));
+	if (ret) {
+		goto error;
+	}
+
 	return lh;
+
+error:
+	free(lh);
+	return NULL;
 }
 
 void lttng_health_destroy(struct lttng_health *lh)