@matheusbsbs / matheus-bagliano / commits / bb9e15a83c
Fork 0

Fix possible out-of-bounds array access

If match is "", match[-1] is accessed. Let pathspec_matches return 1 in that case indicating that "" matches everything. Incidently this fixes git-grep'ing in ".". Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Uwe Zeisberger committed Jun 21, 2006 at 11:04 UTC bb9e15a83c425ff31e4da6b004bd4557d528b755
1 file changed +5 -4
builtin-grep.c
+5 -4
@@ -29,10 +29,11 @@ static int pathspec_matches(const char **paths, const char *name)
29 int matchlen = strlen(match);
30 const char *cp, *meta;
31
32 - if ((matchlen <= namelen) &&
33 - !strncmp(name, match, matchlen) &&
34 - (match[matchlen-1] == '/' ||
35 - name[matchlen] == '\0' || name[matchlen] == '/'))
32 + if (!matchlen ||
33 + ((matchlen <= namelen) &&
34 + !strncmp(name, match, matchlen) &&
35 + (match[matchlen-1] == '/' ||
36 + name[matchlen] == '\0' || name[matchlen] == '/')))
37 return 1;
38 if (!fnmatch(match, name, 0))
39 return 1;