From 0b8696256ba3cd76af2a34184c7a95844304d6eb Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 1 May 2021 02:55:20 +0900 Subject: [PATCH] path-util: use path_is_safe() in path_is_normalized() --- src/basic/path-util.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/basic/path-util.c b/src/basic/path-util.c index 48535da7256..4b83232df88 100644 --- a/src/basic/path-util.c +++ b/src/basic/path-util.c @@ -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)) - return false; - - if (dot_or_dot_dot(p)) - return false; - - if (startswith(p, "../") || endswith(p, "/..") || strstr(p, "/../")) + if (!path_is_safe(p)) return false; - if (startswith(p, "./") || endswith(p, "/.") || strstr(p, "/./")) + if (streq(p, ".") || startswith(p, "./") || endswith(p, "/.") || strstr(p, "/./")) return false; if (strstr(p, "//")) -- 2.47.3