From: Karel Zak <kzak@redhat.com>
Date: Thu, 2 Mar 2017 13:04:47 +0000 (+0100)
Subject: column: don't ignore mbs_to_wcs() errors
X-Git-Tag: v2.30-rc1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cc2ade8264e9e0533e9683792fa1b67a9de5082;p=thirdparty%2Futil-linux.git

column: don't ignore mbs_to_wcs() errors

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/text-utils/column.c b/text-utils/column.c
index 51a5b8efd8..d912369592 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -444,6 +444,8 @@ static int input(struct column_control *ctl, FILE *fp)
 						maxents * sizeof(wchar_t *));
 			}
 			ctl->ents[ctl->nents] = mbs_to_wcs(str);
+			if (!ctl->ents[ctl->nents])
+				err(EXIT_FAILURE, _("read failed"));
 			len = width(ctl->ents[ctl->nents]);
 			if (ctl->maxlength < len)
 				ctl->maxlength = len;