Tests: abort test on memory allocation failure

[lttng-tools.git] / tests / unit / test_utils_expand_path.c

diff --git a/tests/unit/test_utils_expand_path.c b/tests/unit/test_utils_expand_path.c
index 6b809b88d99b0d724b1ed579ecdef03d2834519f..44173f6f023e2c18ae8eb848ef15965c0978ca7c 100644 (file)
--- a/tests/unit/test_utils_expand_path.c
+++ b/tests/unit/test_utils_expand_path.c
@@ -28,9 +28,12 @@
 
 #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;
+int lttng_opt_mi;
 
 struct valid_test_input {
        char *input;
@@ -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 =
@@ -122,24 +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");
-                       return 1;
+                       ret = -1;
+                       goto end;
                }
 
                if (strcmp(valid_tests_inputs[i].relative_part, ".") == 0) {
@@ -156,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;
 
@@ -177,7 +196,7 @@ int free_valid_results()
        return 0;
 }
 
-int prepare_symlink_tree()
+int prepare_symlink_tree(void)
 {
        int i;
        char tmppath[PATH_MAX];
@@ -218,7 +237,7 @@ error:
        return 1;
 }
 
-int free_symlink_tree()
+int free_symlink_tree(void)
 {
        int i;
        char tmppath[PATH_MAX];