diff options
| author | Olivier Marin <dkr@freesurf.fr> | 2008-07-21 18:30:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-22 04:20:04 (GMT) |
| commit | d5d745f90b929310f3893bb8b3766cc1745140c8 (patch) | |
| tree | de67ef03b447f77d5484f45b2288b73dede8383b | |
| parent | 0d4ede9f5493f0e15fb4f799e6a4a25e36c49fd2 (diff) | |
| download | git-d5d745f90b929310f3893bb8b3766cc1745140c8.zip git-d5d745f90b929310f3893bb8b3766cc1745140c8.tar.gz git-d5d745f90b929310f3893bb8b3766cc1745140c8.tar.bz2 | |
parse-options: fix segmentation fault when a required value is missing
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>
| -rw-r--r-- | parse-options.c | 2 | ||||
| -rwxr-xr-x | t/t0040-parse-options.sh | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/parse-options.c b/parse-options.c index 987b015..71a7acf 100644 --- a/parse-options.c +++ b/parse-options.c @@ -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 diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index 6309aed..03dbe00 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -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 |