summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorLibravatar Andrew Wong <andrew.kw.w@gmail.com>2013-03-09 18:46:00 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-14 09:39:36 -0700
commitf612a67eac32d73d781503d39077371977d46eae (patch)
tree60641e0f30550d598940fecb348990782a318ffe /setup.c
parentsetup.c: stop prefix_pathspec() from looping past the end of string (diff)
downloadtgif-f612a67eac32d73d781503d39077371977d46eae.tar.xz
setup.c: check that the pathspec magic ends with ")"
The previous code did not diagnose an incorrectly spelled ":(top" as an error. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/setup.c b/setup.c
index e61458a7d0..da0d8c80ba 100644
--- a/setup.c
+++ b/setup.c
@@ -216,8 +216,9 @@ static const char *prefix_pathspec(const char *prefix, int prefixlen, const char
die("Invalid pathspec magic '%.*s' in '%s'",
(int) len, copyfrom, elt);
}
- if (*copyfrom == ')')
- copyfrom++;
+ if (*copyfrom != ')')
+ die("Missing ')' at the end of pathspec magic in '%s'", elt);
+ copyfrom++;
} else {
/* shorthand */
for (copyfrom = elt + 1;