Fix: test_utils_expand_path passes NULL to sprintf

[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 65582ff805cee08ab8c1dedeb1bba48df966f54a..aa7984b4026b38e4385f11d26b07545444c9bb1c 100644 (file)
--- a/tests/unit/test_utils_expand_path.c
+++ b/tests/unit/test_utils_expand_path.c
@@ -26,11 +26,13 @@
 
 #include <tap/tap.h>
 
-#include <src/common/utils.h>
+#include <common/utils.h>
+#include <common/common.h>
 
-/* For lttngerr.h */
+/* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose = 3;
+int lttng_opt_mi;
 
 struct valid_test_input {
        char *input;
@@ -124,24 +126,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) {
@@ -158,15 +173,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;
 
@@ -179,7 +195,7 @@ int free_valid_results()
        return 0;
 }
 
-int prepare_symlink_tree()
+int prepare_symlink_tree(void)
 {
        int i;
        char tmppath[PATH_MAX];
@@ -220,7 +236,7 @@ error:
        return 1;
 }
 
-int free_symlink_tree()
+int free_symlink_tree(void)
 {
        int i;
        char tmppath[PATH_MAX];
@@ -295,9 +311,12 @@ static void test_utils_expand_path(void)
 
        /* Test invalid cases */
        for (i = 0; i < num_invalid_tests; i++) {
-               sprintf(name, "invalid test case: %s", invalid_tests_inputs[i]);
+               const char *test_input = invalid_tests_inputs[i];
+
+               sprintf(name, "invalid test case: %s", test_input ?
+                               test_input : "NULL");
 
-               result = utils_expand_path(invalid_tests_inputs[i]);
+               result = utils_expand_path(test_input);
                if (result != NULL) {
                        free(result);
                }