X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fconf.c;h=d3f03136807d26344976e4703226f79f04ed17dc;hb=21e7004241987b45d97491cac624a812225cc384;hp=5a0da9d338feb6e3322965602f55386a87f301c2;hpb=feb0f3e5900ff58202ea0c3f227de3c1b8291952;p=lttng-tools.git

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index 5a0da9d33..d3f031368 100644
--- a/src/bin/lttng/conf.c
+++ b/src/bin/lttng/conf.c
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <common/error.h>
+#include <common/common.h>
 #include <common/utils.h>
 
 #include "conf.h"
@@ -186,8 +186,11 @@ char *config_read_session_name(char *path)
 	int ret;
 	FILE *fp;
 	char var[NAME_MAX], *session_name;
+#if (NAME_MAX == 255)
+#define NAME_MAX_SCANF_IS_A_BROKEN_API	"254"
+#endif
 
-	session_name = malloc(NAME_MAX);
+	session_name = zmalloc(NAME_MAX);
 	if (session_name == NULL) {
 		ERR("Out of memory");
 		goto error;
@@ -202,7 +205,9 @@ char *config_read_session_name(char *path)
 	}
 
 	while (!feof(fp)) {
-		if ((ret = fscanf(fp, "%[^'=']=%s\n", var, session_name)) != 2) {
+		if ((ret = fscanf(fp, "%" NAME_MAX_SCANF_IS_A_BROKEN_API
+				"[^'=']=%" NAME_MAX_SCANF_IS_A_BROKEN_API "s\n",
+				var, session_name)) != 2) {
 			if (ret == -1) {
 				ERR("Missing session=NAME in config file.");
 				goto error_close;