From a545b5e44bff6e3dca75bc223a8edd885fc964f8 Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov Date: Tue, 2 Dec 2014 16:05:10 +0000 Subject: [PATCH] argp: avoid extraneous translation and mem leak with empty pre doc * lib/argp-help.c (argp_doc): Never translate the empty string, when "\v" is the first or last character of the string, as that has a reserved meaning to return the header info from a po file. This also fixes a small memory leak in the !post case. The issue can be seen with this command for example: LC_MESSAGES=en_US grub2-mknetdir --help --- ChangeLog | 10 ++++++++++ lib/argp-help.c | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2dd5516..d7911af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2014-12-02 Andrei Borzenkov + + argp: avoid extraneous translation and mem leak with empty pre doc + * lib/argp-help.c (argp_doc): Never translate the empty string, + when "\v" is the first or last character of the string, as that + has a reserved meaning to return the header info from a po file. + This also fixes a small memory leak in the !post case. + The issue can be seen with this command for example: + LC_MESSAGES=en_US grub2-mknetdir --help + 2014-11-27 Daiki Ueno uniname/uniname-tests: skip if system's libunistring is used diff --git a/lib/argp-help.c b/lib/argp-help.c index 9044e1b..f15138b 100644 --- a/lib/argp-help.c +++ b/lib/argp-help.c @@ -1506,11 +1506,15 @@ argp_doc (const struct argp *argp, const struct argp_state *state, if (vt) { if (post) - inp_text = vt + 1; + { + inp_text = vt + 1; + if (! *inp_text) + inp_text = 0; + } else { inp_text_len = vt - argp->doc; - inp_text = __strndup (argp->doc, inp_text_len); + inp_text = inp_text_len ? __strndup (argp->doc, inp_text_len) : 0; } } else -- 2.1.0