diff options
| author | Bruno Haible <bruno@clisp.org> | 2019-01-05 17:15:29 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2019-01-05 17:15:29 +0100 |
| commit | 5f985580b9473b951eff13d92db613d464884091 (patch) | |
| tree | 925774d09b17dbf53a5e548ca6ba5c02a28b2aae | |
| parent | ff3fe55c7c95bdb9460a40747912b4b309519838 (diff) | |
| download | gnulib-5f985580b9473b951eff13d92db613d464884091.tar.gz | |
argp: Don't pass an invalid argument to dgettext().
Reported by He X <xw897002528@gmail.com>.
* lib/argp-help.c (print_header, argp_doc): Don't pass a NULL doc to
dgettext().
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/argp-help.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -2,6 +2,13 @@ argp: Don't pass an invalid argument to dgettext(). Reported by He X <xw897002528@gmail.com>. + * lib/argp-help.c (print_header, argp_doc): Don't pass a NULL doc to + dgettext(). + +2019-01-05 Bruno Haible <bruno@clisp.org> + + argp: Don't pass an invalid argument to dgettext(). + Reported by He X <xw897002528@gmail.com>. * lib/argp.h (struct argp): Clarify that the args_doc field may be NULL. * lib/argp-help.c (argp_args_usage): Don't pass a NULL args_doc to dgettext(). diff --git a/lib/argp-help.c b/lib/argp-help.c index e5e97ecf6c..75abe84dfe 100644 --- a/lib/argp-help.c +++ b/lib/argp-help.c @@ -1021,7 +1021,7 @@ static void print_header (const char *str, const struct argp *argp, struct pentry_state *pest) { - const char *tstr = dgettext (argp->argp_domain, str); + const char *tstr = str ? dgettext (argp->argp_domain, str) : NULL; const char *fstr = filter_doc (tstr, ARGP_KEY_HELP_HEADER, argp, pest->state); if (fstr) @@ -1479,7 +1479,7 @@ argp_doc (const struct argp *argp, const struct argp_state *state, void *input = 0; int anything = 0; size_t inp_text_limit = 0; - const char *doc = dgettext (argp->argp_domain, argp->doc); + const char *doc = argp->doc ? dgettext (argp->argp_domain, argp->doc) : NULL; const struct argp_child *child = argp->children; if (doc) |