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

path-util: use path_is_safe() in path_is_normalized()

Browse Source
This commit is contained in:
Yu Watanabe
2021-05-28 13:41:23 +09:00
parent 32df2e1447
commit 0b8696256b
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/path-util.c
+2 -9
View File
@@ -1057,17 +1057,10 @@ bool path_is_valid_full(const char *p, bool accept_dot_dot) {
}
bool path_is_normalized(const char *p) {
if (!path_is_valid(p))
if (!path_is_safe(p))
return false;
if (dot_or_dot_dot(p))
return false;
if (startswith(p, "../") || endswith(p, "/..") || strstr(p, "/../"))
return false;
if (startswith(p, "./") || endswith(p, "/.") || strstr(p, "/./"))
if (streq(p, ".") || startswith(p, "./") || endswith(p, "/.") || strstr(p, "/./"))
return false;
if (strstr(p, "//"))