X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_utils_expand_path.c;h=44173f6f023e2c18ae8eb848ef15965c0978ca7c;hp=f863b5d9a344c33798936dbf60241eca8151bd22;hb=890d8fe47755c3bad936389cf48ffa141cff41c9;hpb=c7e35b037773dbbfe10178c946ba44feefb226e1

diff --git a/tests/unit/test_utils_expand_path.c b/tests/unit/test_utils_expand_path.c
index f863b5d9a..44173f6f0 100644
--- a/tests/unit/test_utils_expand_path.c
+++ b/tests/unit/test_utils_expand_path.c
@@ -28,6 +28,8 @@
 
 #include <src/common/utils.h>
 
+#include <common/common.h>
+
 /* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose = 3;
@@ -125,25 +127,37 @@ static void printerr(char *msg)
 	fprintf(stderr, "test_utils_expand_path: error: %s\n", msg);
 }
 
-int prepare_valid_results()
+int prepare_valid_results(void)
 {
 	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");
-			free(empty);
-			return 1;
+			ret = -1;
+			goto end;
 		}
 
 		if (strcmp(valid_tests_inputs[i].relative_part, ".") == 0) {
@@ -160,15 +174,16 @@ 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()
+int free_valid_results(void)
 {
 	int i;
 
@@ -181,7 +196,7 @@ int free_valid_results()
 	return 0;
 }
 
-int prepare_symlink_tree()
+int prepare_symlink_tree(void)
 {
 	int i;
 	char tmppath[PATH_MAX];
@@ -222,7 +237,7 @@ error:
 	return 1;
 }
 
-int free_symlink_tree()
+int free_symlink_tree(void)
 {
 	int i;
 	char tmppath[PATH_MAX];