From fbcf84e542d5abad1f3fbdf4759874cf414946d5 Mon Sep 17 00:00:00 2001 From: Darren Kenny Date: Fri, 18 Jun 2021 19:32:00 +0200 Subject: [PATCH] argp: Avoid possible NULL access in argp_help. Reported by Coverity. The invocation chain is: argp_help -> _help -> fill_in_uparams -> validate_uparams. * lib/argp-help.c (validate_uparams): Don't crash if state == NULL. --- ChangeLog | 7 +++++++ lib/argp-help.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7eb9befcc6..6b4951cc73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2021-06-18 Darren Kenny (tiny change) + + argp: Avoid possible NULL access in argp_help. + Reported by Coverity. The invocation chain is: + argp_help -> _help -> fill_in_uparams -> validate_uparams. + * lib/argp-help.c (validate_uparams): Don't crash if state == NULL. + 2021-06-16 Bruno Haible tsearch: Relicense under LGPLv2+. diff --git a/lib/argp-help.c b/lib/argp-help.c index 4c89697bdd..80cdb44937 100644 --- a/lib/argp-help.c +++ b/lib/argp-help.c @@ -147,7 +147,8 @@ validate_uparams (const struct argp_state *state, struct uparams *upptr) if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin) { __argp_failure (state, 0, 0, - dgettext (state->root_argp->argp_domain, + dgettext (state == NULL ? NULL + : state->root_argp->argp_domain, "\ ARGP_HELP_FMT: %s value is less than or equal to %s"), "rmargin", up->name); -- 2.39.5