[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] lib/argp-help: Fix possible dereference of a NULL state
From: |
Darren Kenny |
Subject: |
[PATCH 2/3] lib/argp-help: Fix possible dereference of a NULL state |
Date: |
Fri, 18 Jun 2021 15:44:22 +0000 |
All other instances of call to __argp_failure() where there is
a dgettext() call first check whether the valie of state is NULL
before attempting to dereference it to get the root_argp->argp_domain.
This was originally found during a Coverity scan of GRUB2.
Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
---
lib/argp-help.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/argp-help.c b/lib/argp-help.c
index 4c89697bdd05..80cdb44937d3 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.18.4