undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setup.c: stop prefix_pathspec() from looping past the end of string

Browse Source 
The code assumes that the string ends at either `)` or `,`, and does
not handle the case where strcspn() returns length due to end of
string.  So specifying ":(top" as pathspec will cause the loop to go
past the end of string.

Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Andrew Wong 2013-03-07 11:36:03 -05:00 committed by Junio C Hamano
parent 7e2010537e
commit 772e47cd67
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup.c
View File

@ -199,10 +199,11 @@ static const char *prefix_pathspec(const char *prefix, int prefixlen, const char
*copyfrom && *copyfrom != ')'; *copyfrom && *copyfrom != ')';
copyfrom = nextat) { copyfrom = nextat) {
size_t len = strcspn(copyfrom, ",)"); size_t len = strcspn(copyfrom, ",)");
if (copyfrom[len] == ')') if (copyfrom[len] == ',')
nextat = copyfrom + len;
else
nextat = copyfrom + len + 1; nextat = copyfrom + len + 1;
else
/* handle ')' and '\0' */
nextat = copyfrom + len;
if (!len) if (!len)
continue; continue;
for (i = 0; i < ARRAY_SIZE(pathspec_magic); i++) for (i = 0; i < ARRAY_SIZE(pathspec_magic); i++)