From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 26 Nov 2014 17:33:09 +0000 (-0500)
Subject: Fix: lttng conf.c: use zmalloc()
X-Git-Tag: v2.6.0-rc4~23
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=21e7004241987b45d97491cac624a812225cc384;p=lttng-tools.git

Fix: lttng conf.c: use zmalloc()

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index 55ed63526..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"
@@ -190,7 +190,7 @@ char *config_read_session_name(char *path)
 #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;