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

parse-options: fix segmentation fault when a required value is missing

Browse Source 
p->argc represent the number of arguments that have not been parsed yet,
_including_ the one we are currently parsing. If it is not greater than
one then there is no more argument.

Signed-off-by: Olivier Marin <dkr@freesurf.fr>
Acked-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Olivier Marin 2008-07-21 20:30:36 +02:00 committed by Junio C Hamano
parent 0d4ede9f54
commit d5d745f90b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parse-options.c
View File

@ -22,7 +22,7 @@ static int get_arg(struct parse_opt_ctx_t *p, const struct option *opt,
p->opt = NULL;
} else if (p->argc == 1 && (opt->flags & PARSE_OPT_LASTARG_DEFAULT)) {
*arg = (const char *)opt->defval;
} else if (p->argc) {
} else if (p->argc > 1) {
p->argc--;
*arg = *++p->argv;
} else

7
t/t0040-parse-options.sh
View File

@ -78,6 +78,13 @@ test_expect_success 'long options' '
test_cmp expect output
'
test_expect_success 'missing required value' '
test-parse-options -s;
test $? = 129 &&
test-parse-options --string;
test $? = 129
'
cat > expect << EOF
boolean: 1
integer: 13