[PATCH 1/4] exclude: stricten a length check in EXC_FLAG_ENDSWITH case
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Oct 14, 2012, 11:55 UTC
- Message-ID
- <1350215742-20761-2-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1350215742-20761-1-git-send-email-pclouds@gmail.com>
This block of code deals with the "basename" part only, which has the length of "pathlen - (basename - pathname)". Stricten the length check and remove "pathname" from the main expression to avoid confusion.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- dir.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dir.c b/dir.c index cddf043..d81498e 100644 --- a/dir.c +++ b/dir.c @@ -561,8 +561,9 @@ int excluded_from_list(const char *pathname, if (!strcmp_icase(exclude, basename)) return to_exclude; } else if (x->flags & EXC_FLAG_ENDSWITH) { - if (x->patternlen - 1 <= pathlen && - !strcmp_icase(exclude + 1, pathname + pathlen - x->patternlen + 1)) + int len = pathlen - (basename - pathname); + if (x->patternlen - 1 <= len && + !strcmp_icase(exclude + 1, basename + len - x->patternlen + 1)) return to_exclude; } else { if (fnmatch_icase(exclude, basename, 0) == 0)
-- 1.8.0.rc2.11.g2b79d01