From: Nguyễn Thái Ngọc Duy Date: Mon, 15 Oct 2012 06:24:34 +0000 (+0700) Subject: exclude: stricten a length check in EXC_FLAG_ENDSWITH case X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=692663303f67371a2e4af4e3d353b042f754c036;p=git.git exclude: stricten a length check in EXC_FLAG_ENDSWITH case 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 Signed-off-by: Junio C Hamano --- diff --git a/dir.c b/dir.c index 0015cc54f..b0ae417b3 100644 --- a/dir.c +++ b/dir.c @@ -534,8 +534,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)