[PATCH 3/4] dir.c: make match_{base,path}name respect {basename,path}len
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:56:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
When match_basename was split out of excluded_from_list in 593cb88
(exclude: split basename matching code into a separate function -
2012-10-15), it took basenamelen only as a hint. basename was required
to be NUL-terminated at the given length.
This was fine until match_basename had a new caller (from attr.c) and
therefore was no longer excluded_from_list's internal business. Make
match_basename stop relying on the NUL assumption above.
Do the same for match_pathname. From now on, only pattern is required
to be NUL-terminated at the specified patternlen for both
match_{base,path}name.
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted>
---
dir.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/dir.c b/dir.c
index 57394e4..30f5241 100644
--- a/dir.c
+++ b/dir.c@@ -626,15 +626,18 @@ int match_basename(const char *basename, int basenamelen, int flags) { if (prefix == patternlen) { - if (!strcmp_icase(pattern, basename)) + if (patternlen == basenamelen && + !strncmp_icase(pattern, basename, basenamelen)) return 1; } else if (flags & EXC_FLAG_ENDSWITH) { if (patternlen - 1 <= basenamelen && - !strcmp_icase(pattern + 1, - basename + basenamelen - patternlen + 1)) + !strncmp_icase(pattern + 1, + basename + basenamelen - patternlen + 1, + patternlen - 1)) return 1; } else { - if (fnmatch_icase(pattern, basename, 0) == 0) + if (nwildmatch(pattern, basename, basenamelen, + ignore_case ? WM_CASEFOLD : 0, NULL) == 0) return 1; } return 0;
@@ -684,7 +687,7 @@ int match_pathname(const char *pathname, int pathlen, namelen -= prefix; } - return wildmatch(pattern, name, + return nwildmatch(pattern, name, namelen, WM_PATHNAME | (ignore_case ? WM_CASEFOLD : 0), NULL) == 0; }
--
1.8.2.82.gc24b958