# [PATCH] parse-options: fix segmentation fault when a required value is missing 3 messages from 2008-07-21 to 2008-07-22. Participants: Olivier Marin, Pierre Habouzit. Thread: https://gitlist.dev/t/14574 ## Olivier Marin, 2008-07-21 18:30 Subject: [PATCH] parse-options: fix segmentation fault when a required value is missing Message-ID: <4884D5CC.2070007@free.fr> URL: https://gitlist.dev/e/4884D5CC.2070007%40free.fr ``` From: Olivier Marin 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 --- I hope this is the right fix. parse-options.c | 2 +- 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 -- 1.6.0.rc0.1.g75f42 ``` ## Pierre Habouzit, 2008-07-21 19:07 Subject: Re: [PATCH] parse-options: fix segmentation fault when a required value is missing Message-ID: <20080721190709.GD2718@artemis.madism.org> URL: https://gitlist.dev/e/20080721190709.GD2718%40artemis.madism.org In-Reply-To: <4884D5CC.2070007@free.fr> ``` On Mon, Jul 21, 2008 at 06:30:36PM +0000, Olivier Marin wrote: > From: Olivier Marin > > 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 > --- > I hope this is the right fix. > > parse-options.c | 2 +- > 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 Gasp thanks, Junio pointed it to me already, and for some reason this hasn't made it. -- ·O· Pierre Habouzit ··O madcoder@debian.org OOO http://www.madism.org ``` ## Olivier Marin, 2008-07-22 10:11 Subject: [PATCH v2] parse-options: fix segmentation fault when a required value is missing Message-ID: <1216721493-17836-1-git-send-email-dkr+ml.git@free.fr> URL: https://gitlist.dev/e/1216721493-17836-1-git-send-email-dkr%2Bml.git%40free.fr In-Reply-To: <20080721190709.GD2718@artemis.madism.org> ``` From: Olivier Marin 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 --- The same, not whitespace damaged! Sorry for the noise. parse-options.c | 2 +- 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 -- 1.6.0.rc0.136.g55999 ```