system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-04 15:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

chase: Tighten "." and "./" check

Browse source 
Currently the check also succeeds if the input path starts with a dot, whereas
we only want it to succeed for "." and "./". Tighten the check and add a test.
This commit is contained in:
Daan De Meyer 2024-06-06 22:59:36 +02:00 committed by Luca Boccassi
parent 8843726ac2
commit 7efaab482a
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/basic/chase.c
View file

@ -641,8 +641,8 @@ int chase(const char *path, const char *root, ChaseFlags flags, char **ret_path,
* absolute, hence it is not necessary to prefix with the root. When "root" points to
* a non-root directory, the result path is always normalized and relative, hence
* we can simply call path_join() and not necessary to call path_simplify().
* Note that the result of chaseat() may start with "." (more specifically, it may be
* "." or "./"), and we need to drop "." in that case. */
* As a special case, chaseat() may return "." or "./", which are normalized too,
* but we need to drop "." before merging with root. */
if (empty_or_root(root))
assert(path_is_absolute(p));
@ -651,7 +651,7 @@ int chase(const char *path, const char *root, ChaseFlags flags, char **ret_path,
assert(!path_is_absolute(p));
q = path_join(root, p + (*p == '.'));
q = path_join(root, p + STR_IN_SET(p, ".", "./"));
if (!q)
return -ENOMEM;

6
src/test/test-chase.c
View file

@ -236,6 +236,12 @@ TEST(chase) {
ASSERT_STREQ(result, "/test-chase.fsldajfl");
result = mfree(result);
r = chase("/.path/with/dot", temp, CHASE_PREFIX_ROOT|CHASE_NONEXISTENT, &result, NULL);
ASSERT_OK(r);
q = strjoina(temp, "/.path/with/dot");
ASSERT_STREQ(result, q);
result = mfree(result);
r = chase("/etc/machine-id/foo", NULL, 0, &result, NULL);
assert_se(IN_SET(r, -ENOTDIR, -ENOENT));
result = mfree(result);