summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Gernhardt <benji@silverinsanity.com>2006-12-22 13:56:25 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-23 07:17:20 (GMT)
commitc321f00d09f56dcf2f149757a2a337f3732f3097 (patch)
tree8c510e21b9456ddb49d054490705ba4e895b47fa
parent4b1552238ec3b8b711f60b2b65265a751a40f5ff (diff)
downloadgit-c321f00d09f56dcf2f149757a2a337f3732f3097.zip
git-c321f00d09f56dcf2f149757a2a337f3732f3097.tar.gz
git-c321f00d09f56dcf2f149757a2a337f3732f3097.tar.bz2
Keep "git --git-dir" from causing a bus error.
The option checking code for --git-dir had an off by 1 error that would cause it to access uninitialized memory if it was the last argument. This causes it to display an error and display the usage string instead. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--git.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/git.c b/git.c
index 73cf4d4..7bb61d8 100644
--- a/git.c
+++ b/git.c
@@ -59,8 +59,10 @@ static int handle_options(const char*** argv, int* argc)
} else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) {
setup_pager();
} else if (!strcmp(cmd, "--git-dir")) {
- if (*argc < 1)
- return -1;
+ if (*argc < 2) {
+ fprintf(stderr, "No directory given for --git-dir.\n" );
+ usage(git_usage_string);
+ }
setenv("GIT_DIR", (*argv)[1], 1);
(*argv)++;
(*argc)--;