From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 19 Oct 2015 21:37:27 +0000 (-0400)
Subject: Port: Explicitly allocate realpath() resolved buffer
X-Git-Tag: v2.8.0-rc1~252
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=d7c23421dddd4dcfbdfd329299816fa7d020eeb8

Port: Explicitly allocate realpath() resolved buffer

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

diff --git a/src/common/utils.c b/src/common/utils.c
index 11018739b..2417a7d25 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -36,6 +36,7 @@
 #include <common/compat/getenv.h>
 #include <common/compat/string.h>
 #include <common/compat/dirent.h>
+#include <lttng/constant.h>
 
 #include "utils.h"
 #include "defaults.h"
@@ -81,6 +82,8 @@ char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
 
 	/* Resolve the canonical path of the first part of the path */
 	while (try_path != NULL && next != end) {
+		char *try_path_buf = NULL;
+
 		/*
 		 * If there is not any '/' left, we want to try with
 		 * the full path
@@ -97,9 +100,16 @@ char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
 			goto error;
 		}
 
+		try_path_buf = zmalloc(LTTNG_PATH_MAX);
+		if (!try_path_buf) {
+			PERROR("zmalloc");
+			goto error;
+		}
+
 		/* Try to resolve this part */
-		try_path = realpath((char *)cut_path, NULL);
+		try_path = realpath((char *)cut_path, try_path_buf);
 		if (try_path == NULL) {
+			free(try_path_buf);
 			/*
 			 * There was an error, we just want to be assured it
 			 * is linked to an unexistent directory, if it's another
@@ -116,6 +126,7 @@ char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
 			}
 		} else {
 			/* Save the place we are before trying the next step */
+			try_path_buf = NULL;
 			free(try_path_prev);
 			try_path_prev = try_path;
 			prev = next;