Re: [PATCH v2] rev-parse: Check argc before using argv[i+1]
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Jan 28, 2014, 22:01 UTC
- Message-ID
- <52E828AD.2040609@kdbg.org>
- In-Reply-To
- <1390944060-783-1-git-send-email-dhsharp@google.com>
Am 28.01.2014 22:21, schrieb David Sharp:
Show 15 quoted lines
> @@ -738,9 +740,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 = argv[++i];
> if (!gitdir)
> - die("not a gitdir '%s'", argv[i+1]);
> + die("--resolve-git-dir requires an argument");
> + gitdir = resolve_gitdir(gitdir);
> + if (!gitdir)
> + die("not a gitdir '%s'", argv[i]);
> puts(gitdir);
> continue;
> }In this hunk, I don't see where the old code incremented i for the argument. Was this another bug lurking that is fixed now?
-- Hannes