summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>2014-09-30 22:18:18 +0200
committerThomas Hindoe Paaboel Andersen <phomes@gmail.com>2014-09-30 22:28:46 +0200
commit59ae3a957388bb057c3388ee288c8fc96c2b0098 (patch)
treecc06cb191687390a54e89cb783fee87c417151c6
parent791a4fd837c713fe742d32cde1ce16f754dd30df (diff)
test-path-util: fix a mem leak and avoid confusing coverity
Found with coverity. Fixes CID#1237754 and #1237790
-rw-r--r--src/test/test-path-util.c37
1 files changed, 22 insertions, 15 deletions
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index 01afb3e6fe..63d64b28b0 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -163,17 +163,24 @@ static void test_prefixes(void) {
}
static void test_path_join(void) {
- assert_se(streq(path_join("/root", "/a/b", "/c"), "/root/a/b/c"));
- assert_se(streq(path_join("/root", "a/b", "c"), "/root/a/b/c"));
- assert_se(streq(path_join("/root", "/a/b", "c"), "/root/a/b/c"));
- assert_se(streq(path_join("/root", "/", "c"), "/root//c"));
- assert_se(streq(path_join("/root", "/", NULL), "/root/"));
-
- assert_se(streq(path_join(NULL, "/a/b", "/c"), "/a/b/c"));
- assert_se(streq(path_join(NULL, "a/b", "c"), "a/b/c"));
- assert_se(streq(path_join(NULL, "/a/b", "c"), "/a/b/c"));
- assert_se(streq(path_join(NULL, "/", "c"), "//c"));
- assert_se(streq(path_join(NULL, "/", NULL), "/"));
+
+#define test_join(root, path, rest, expected) { \
+ _cleanup_free_ char *z = NULL; \
+ z = path_join(root, path, rest); \
+ assert_se(streq(z, expected)); \
+ }
+
+ test_join("/root", "/a/b", "/c", "/root/a/b/c");
+ test_join("/root", "a/b", "c", "/root/a/b/c");
+ test_join("/root", "/a/b", "c", "/root/a/b/c");
+ test_join("/root", "/", "c", "/root//c");
+ test_join("/root", "/", NULL, "/root/");
+
+ test_join(NULL, "/a/b", "/c", "/a/b/c");
+ test_join(NULL, "a/b", "c", "a/b/c");
+ test_join(NULL, "/a/b", "c", "/a/b/c");
+ test_join(NULL, "/", "c", "//c");
+ test_join(NULL, "/", NULL, "/");
}
static void test_fsck_exists(void) {
@@ -192,10 +199,10 @@ static void test_make_relative(void) {
assert_se(path_make_relative("some/relative/path", "/some/path", &result) < 0);
assert_se(path_make_relative("/some/path", "some/relative/path", &result) < 0);
-#define test(from_dir, to_path, expected) { \
- path_make_relative(from_dir, to_path, &result); \
- assert_se(streq(result, expected)); \
- free(result); \
+#define test(from_dir, to_path, expected) { \
+ _cleanup_free_ char *z = NULL; \
+ path_make_relative(from_dir, to_path, &z); \
+ assert_se(streq(z, expected)); \
}
test("/", "/", ".");