From 91f6895fffe37257729c93a350344da296a59cb0 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 14 Apr 2021 16:15:34 +0200 Subject: [PATCH] prlimit: make code more robust The prlimit description are always defined as static strings, but it seems better to make the code more readable and robust for static analyzers and readers. Fix also missing gettext() call for description help. Fixes: https://github.com/karelzak/util-linux/issues/1277 Signed-off-by: Karel Zak --- sys-utils/prlimit.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c index 18601efd3..1bdb2cb45 100644 --- a/sys-utils/prlimit.c +++ b/sys-utils/prlimit.c @@ -233,10 +233,12 @@ static void add_scols_line(struct libscols_table *table, struct prlimit *l) switch (get_column_id(i)) { case COL_RES: - str = xstrdup(l->desc->name); + if (l->desc->name) + str = xstrdup(l->desc->name); break; case COL_HELP: - str = xstrdup(l->desc->help); + if (l->desc->help) + str = xstrdup(_(l->desc->help)); break; case COL_SOFT: if (l->rlim.rlim_cur == RLIM_INFINITY) @@ -251,7 +253,8 @@ static void add_scols_line(struct libscols_table *table, struct prlimit *l) xasprintf(&str, "%llu", (unsigned long long) l->rlim.rlim_max); break; case COL_UNITS: - str = l->desc->unit ? xstrdup(_(l->desc->unit)) : NULL; + if (l->desc->unit) + str = xstrdup(_(l->desc->unit)); break; default: break;