undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ds/rev-parse-required-args'

Browse Source 
"git rev-parse --default" without the required option argument did
not diagnose it as an error.

* ds/rev-parse-required-args:
  rev-parse: check i before using argv[i] against argc
This commit is contained in:
Junio C Hamano 2014-02-27 14:01:23 -08:00
commit 28006fb046
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/rev-parse.c
View File

@ -547,15 +547,17 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
continue; continue;
} }
if (!strcmp(arg, "--default")) { if (!strcmp(arg, "--default")) {
def = argv[i+1]; def = argv[++i];
i++; if (!def)
die("--default requires an argument");
continue; continue;
} }
if (!strcmp(arg, "--prefix")) { if (!strcmp(arg, "--prefix")) {
prefix = argv[i+1]; prefix = argv[++i];
if (!prefix)
die("--prefix requires an argument");
startup_info->prefix = prefix; startup_info->prefix = prefix;
output_prefix = 1; output_prefix = 1;
i++;
continue; continue;
} }
if (!strcmp(arg, "--revs-only")) { if (!strcmp(arg, "--revs-only")) {
@ -738,9 +740,12 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
continue; continue;
} }
if (!strcmp(arg, "--resolve-git-dir")) { if (!strcmp(arg, "--resolve-git-dir")) {
const char *gitdir = resolve_gitdir(argv[i+1]); const char *gitdir = argv[++i];
if (!gitdir) 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); puts(gitdir);
continue; continue;
} }