From c58baa84eee3b0d80b1ec62c57ba616da99e3125 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 2 Sep 2018 13:40:05 -0400 Subject: Write terminating null in allocating wcs/mbs conversions Turns out wcsnrtombs doesn't. --- pls.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pls.c b/pls.c index 9f6cb69..d91fc97 100644 --- a/pls.c +++ b/pls.c @@ -45,12 +45,13 @@ wchar_t *ambstowcs(const char *src) { wchar_t *dst = malloc(sizeof(*dst) * (1 + len)); if (!dst) return NULL; - len = mbsrtowcs(dst, &src, 1 + len, NULL); + len = mbsrtowcs(dst, &src, len, NULL); if (len == (size_t)-1) { free(dst); return NULL; } + dst[len] = L'\0'; return dst; } @@ -61,12 +62,13 @@ char *awcstombs(const wchar_t *src) { char *dst = malloc(sizeof(*dst) * (1 + len)); if (!dst) return NULL; - len = wcsrtombs(dst, &src, 1 + len, NULL); + len = wcsrtombs(dst, &src, len, NULL); if (len == (size_t)-1) { free(dst); return NULL; } + dst[len] = '\0'; return dst; } @@ -77,12 +79,13 @@ char *awcsntombs(const wchar_t *src, size_t nwc) { char *dst = malloc(sizeof(*dst) * (1 + len)); if (!dst) return NULL; - len = wcsnrtombs(dst, &src, nwc, 1 + len, NULL); + len = wcsnrtombs(dst, &src, nwc, len, NULL); if (len == (size_t)-1) { free(dst); return NULL; } + dst[len] = '\0'; return dst; } -- cgit 1.4.1