Re: [PATCH v2] grep: correctly initialize help-all option
- From
René Scharfe <l.s.r@web.de>
- Date
- Apr 10, 2015, 16:35 UTC
- Message-ID
- <5527FBD3.4000103@web.de>
- In-Reply-To
- <1428609546-3535-1-git-send-email-ps@pks.im>
Am 09.04.2015 um 21:59 schrieb Patrick Steinhardt:
> The "help-all" option is being initialized with a wrong value. > While being semantically wrong this can also cause a segmentation > fault in gcc on ARMv7 hardfloat platforms with a hardened > toolchain. Fix this by initializing with a NULL value.
Because the pointer is not used it can't exactly be "wrong". The callback function could call usage_with_options itself using that pointer, for example. I suspect that's what an earlier version did (I don't remember).
Show 6 quoted lines
> Signed-off-by: Patrick Steinhardt <ps@pks.im> > --- > > Added missing sign-off and changed initialization with &opts to > initialization with NULL according to Eric's comment as the value > is not being used anyway.
Thanks, it looks good.
Show 18 quoted lines
>
> builtin/grep.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/grep.c b/builtin/grep.c
> index abc4400..d04f440 100644
> --- a/builtin/grep.c
> +++ b/builtin/grep.c
> @@ -738,7 +738,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
> PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
> OPT_BOOL(0, "ext-grep", &external_grep_allowed__ignored,
> N_("allow calling of grep(1) (ignored by this build)")),
> - { OPTION_CALLBACK, 0, "help-all", &options, NULL, N_("show usage"),
> + { OPTION_CALLBACK, 0, "help-all", NULL, NULL, N_("show usage"),
> PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
> OPT_END()
> };
>