From d5d745f90b929310f3893bb8b3766cc1745140c8 Mon Sep 17 00:00:00 2001 From: Olivier Marin Date: Mon, 21 Jul 2008 20:30:36 +0200 Subject: [PATCH] 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 Acked-by: Pierre Habouzit Signed-off-by: Junio C Hamano --- parse-options.c | 2 +- t/t0040-parse-options.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/parse-options.c b/parse-options.c index 987b01571..71a7acf4e 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 6309aed45..03dbe0010 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 -- 2.30.2