summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Andrew Wong <andrew.kw.w@gmail.com>2013-03-07 11:36:03 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-14 09:39:09 -0700
commit772e47cd673e048adb0f7b663617ec70e0cfe598 (patch)
treeb759761f8c13a2e19c67d921d9bcd416f7f5feba
parentGit 1.7.12.4 (diff)
downloadtgif-772e47cd673e048adb0f7b663617ec70e0cfe598.tar.xz
setup.c: stop prefix_pathspec() from looping past the end of string
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>
-rw-r--r--setup.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/setup.c b/setup.c
index 3a1b2fd455..e61458a7d0 100644
--- a/setup.c
+++ b/setup.c
@@ -199,10 +199,11 @@ static const char *prefix_pathspec(const char *prefix, int prefixlen, const char
*copyfrom && *copyfrom != ')';
copyfrom = nextat) {
size_t len = strcspn(copyfrom, ",)");
- if (copyfrom[len] == ')')
- nextat = copyfrom + len;
- else
+ if (copyfrom[len] == ',')
nextat = copyfrom + len + 1;
+ else
+ /* handle ')' and '\0' */
+ nextat = copyfrom + len;
if (!len)
continue;
for (i = 0; i < ARRAY_SIZE(pathspec_magic); i++)