From b5448a90c97a06c72dd7420fa63fd5de974f411b Mon Sep 17 00:00:00 2001 From: John Keeping Date: Mon, 17 Feb 2014 08:46:20 +0000 Subject: rev-parse: fix --resolve-git-dir argument handling There are two problems here: 1) If no argument is provided, then the command segfaults 2) The argument is not consumed, so there will be excess output Fix both of these in one go by restructuring the handler for this option. Reported-by: Daniel Hahler Signed-off-by: John Keeping Signed-off-by: Junio C Hamano --- builtin/rev-parse.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index c4b768ffda..7ca031154c 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -715,9 +715,12 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) continue; } if (!strcmp(arg, "--resolve-git-dir")) { - const char *gitdir = resolve_gitdir(argv[i+1]); + const char *gitdir; + if (++i >= argc) + die("--resolve-git-dir requires an argument"); + gitdir = resolve_gitdir(argv[i]); if (!gitdir) - die("not a gitdir '%s'", argv[i+1]); + die("not a gitdir '%s'", argv[i]); puts(gitdir); continue; } -- cgit v1.2.1