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 e32f37753915c2cbeab040728084a170a0051d94..aa7984b4026b38e4385f11d26b07545444c9bb1c 100644 (file)
--- a/tests/unit/test_utils_expand_path.c
+++ b/tests/unit/test_utils_expand_path.c
@@ -15,7 +15,6 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
@@ -27,8 +26,7 @@
 
 #include <tap/tap.h>
 
-#include <src/common/utils.h>
-
+#include <common/utils.h>
 #include <common/common.h>
 
 /* For error.h */
@@ -128,7 +126,7 @@ 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 = NULL, *prev_path = NULL,
@@ -184,7 +182,7 @@ end:
        return ret;
 }
 
-int free_valid_results()
+int free_valid_results(void)
 {
        int i;
 
@@ -197,7 +195,7 @@ int free_valid_results()
        return 0;
 }
 
-int prepare_symlink_tree()
+int prepare_symlink_tree(void)
 {
        int i;
        char tmppath[PATH_MAX];
@@ -238,7 +236,7 @@ error:
        return 1;
 }
 
-int free_symlink_tree()
+int free_symlink_tree(void)
 {
        int i;
        char tmppath[PATH_MAX];
@@ -313,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);
                }