X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_utils_expand_path.c;h=cbe74fb054a366ba4f011c93ad113aabcf751d01;hb=ffb3606a89f0a74bd562bdb38d7037464670d641;hp=6b809b88d99b0d724b1ed579ecdef03d2834519f;hpb=02bf969d126239abcf9912fb51e706fc09ac3592;p=lttng-tools.git

diff --git a/tests/unit/test_utils_expand_path.c b/tests/unit/test_utils_expand_path.c
index 6b809b88d..cbe74fb05 100644
--- a/tests/unit/test_utils_expand_path.c
+++ b/tests/unit/test_utils_expand_path.c
@@ -15,6 +15,7 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define _GNU_SOURCE
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
@@ -28,7 +29,9 @@
 
 #include <src/common/utils.h>
 
-/* For lttngerr.h */
+#include <common/common.h>
+
+/* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose = 3;
 
@@ -70,6 +73,8 @@ static struct valid_test_input valid_tests_inputs[] = {
 	{ ".",				".",		""		},
 	{ "/../a/b/c/d/e",		"",		"/a/b/c/d/e"	},
 	{ "/a/b/c/d/../../../../../e",	"",		"/e"		},
+	{ "/..",			"",		"/"		},
+	{ "/a/..",			"",		"/"		},
 };
 char **valid_tests_expected_results;
 static const int num_valid_tests =
@@ -125,21 +130,34 @@ static void printerr(char *msg)
 int prepare_valid_results()
 {
 	int i;
-	char *relative, *cur_path, *prev_path, *pprev_path, *empty;
+	char *relative, *cur_path = NULL, *prev_path = NULL,
+			*pprev_path = NULL, *empty = NULL;
+	int ret = 0;
 
 	/* Prepare the relative paths */
 	cur_path = realpath(".", NULL);
 	prev_path = realpath("..", NULL);
 	pprev_path = realpath("../..", NULL);
 	empty = strdup("");
+	if (!cur_path || !prev_path || !pprev_path || !empty) {
+		printerr("strdup out of memory");
+		ret = -1;
+		goto end;
+	}
 
 	/* allocate memory for the expected results */
-	valid_tests_expected_results = malloc(sizeof(char *) * num_valid_tests);
+	valid_tests_expected_results = zmalloc(sizeof(char *) * num_valid_tests);
+	if (!valid_tests_expected_results) {
+		printerr("out of memory");
+		ret = -1;
+		goto end;
+	}
 	for (i = 0; i < num_valid_tests; i++) {
 		valid_tests_expected_results[i] = malloc(PATH_MAX);
 		if (valid_tests_expected_results[i] == NULL) {
 			printerr("malloc expected results");
-			return 1;
+			ret = -1;
+			goto end;
 		}
 
 		if (strcmp(valid_tests_inputs[i].relative_part, ".") == 0) {
@@ -156,12 +174,13 @@ int prepare_valid_results()
 				"%s%s", relative, valid_tests_inputs[i].absolute_part);
 	}
 
+end:
 	free(cur_path);
 	free(prev_path);
 	free(pprev_path);
 	free(empty);
 
-	return 0;
+	return ret;
 }
 
 int free_valid_results()