ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

column: make mbs/wcs conversions more robust 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-03-06 12:05:09 +01:00
parent 9dbe8e1c02
commit 86399c3306
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
text-utils/column.c
View File

@ -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;