Fix: test_utils_expand_path.c: out of memory error handling

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/unit/test_utils_expand_path.c b/tests/unit/test_utils_expand_path.c
index fe709acf554b81c9b32a13b41165b34cd97721e2..cbe74fb054a366ba4f011c93ad113aabcf751d01 100644 (file)
--- 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,6 +29,8 @@
 
 #include <src/common/utils.h>
 
+#include <common/common.h>
+
 /* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose = 3;
@@ -127,22 +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");
-                       free(empty);
-                       return 1;
+                       ret = -1;
+                       goto end;
                }
 
                if (strcmp(valid_tests_inputs[i].relative_part, ".") == 0) {
@@ -159,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()