From: Mathieu Desnoyers Date: Wed, 26 Nov 2014 17:43:32 +0000 (-0500) Subject: Fix: test_utils_expand_path.c: out of memory error handling X-Git-Tag: v2.6.0-rc4~14 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=670937a97115f8e9023fe3306e1d949ed9154b6d;p=lttng-tools.git Fix: test_utils_expand_path.c: out of memory error handling Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- diff --git a/tests/unit/test_utils_expand_path.c b/tests/unit/test_utils_expand_path.c index f863b5d9a..e32f37753 100644 --- 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 #include #include @@ -28,6 +29,8 @@ #include +#include + /* For error.h */ int lttng_opt_quiet = 1; int lttng_opt_verbose = 3; @@ -128,22 +131,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) { @@ -160,12 +175,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()