SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

path-util: fix off by one issue to detect slash at the end in path_extend()

Browse Source
This commit is contained in:
Yu Watanabe
2021-05-28 13:41:23 +09:00
parent 05575a104b
commit 340cd6b6f9
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/path-util.c
+1 -1
View File
@@ -597,7 +597,7 @@ char* path_extend_internal(char **x, ...) {
*x = nx;
if (old_sz > 0)
slash = nx[old_sz] == '/';
slash = nx[old_sz-1] == '/';
else {
nx[old_sz] = 0;
slash = true; /* no need to generate a slash anymore */
src/test/test-path-util.c
+8 -2
View File
@@ -397,8 +397,14 @@ static void test_path_extend(void) {
assert_se(path_extend(&p, "/foo") == p);
assert_se(streq(p, "foo/foo"));
assert_se(path_extend(&p, "waaaah/wahhh/") == p);
assert_se(streq(p, "foo/foo/waaaah/wahhh/"));
assert_se(path_extend(&p, "/waaaah/wahhh//") == p);
assert_se(streq(p, "foo/foo/waaaah/wahhh//")); /* path_extend() does not drop redundant slashes */
assert_se(path_extend(&p, "/aaa/bbb/") == p);
assert_se(streq(p, "foo/foo/waaaah/wahhh///aaa/bbb/")); /* but not add an extra slash */
assert_se(free_and_strdup(&p, "/") >= 0);
assert_se(path_extend(&p, "foo") == p);
assert_se(streq(p, "/foo"));
}
static void test_fsck_exists(void) {