From: Karel Zak <kzak@redhat.com>
Date: Mon, 6 Mar 2017 11:05:09 +0000 (+0100)
Subject: column: make mbs/wcs conversions more robust
X-Git-Tag: v2.30-rc1~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86399c3306fb5d287faaa428361d3d16bca8e4ed;p=thirdparty%2Futil-linux.git

column: make mbs/wcs conversions more robust

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

diff --git a/text-utils/column.c b/text-utils/column.c
index e51ea5576c..14123643f3 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -109,7 +109,7 @@ static wchar_t *mbs_to_wcs(const char *s)
 	n = mbstowcs((wchar_t *)0, s, 0);
 	if (n < 0)
 		return NULL;
-	wcs = xmalloc((n + 1) * sizeof(wchar_t));
+	wcs = xcalloc((n + 1) * sizeof(wchar_t), 1);
 	n = mbstowcs(wcs, s, n + 1);
 	if (n < 0) {
 		free(wcs);
@@ -131,7 +131,7 @@ static char *wcs_to_mbs(const wchar_t *s)
 	if (n == (size_t) -1)
 		return NULL;
 
-	str = xmalloc((n + 1));
+	str = xcalloc(n + 1, 1);
 	if (wcstombs(str, s, n) == (size_t) -1) {
 		free(str);
 		return NULL;