d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that the {,v}swprintf functions always null-terminate the

Browse Source 
output string, even if an encoding error or malloc failure occurs.
This commit is contained in:
das 2012-04-21 06:08:29 +00:00
parent 9da846a0f4
commit 8595324df3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libc/stdio/vswprintf.c
View File

@ -66,6 +66,7 @@ vswprintf_l(wchar_t * __restrict s, size_t n, locale_t locale,
f._bf._base = f._p = (unsigned char *)malloc(128);
if (f._bf._base == NULL) {
errno = ENOMEM;
*s = L'\0';
return (-1);
}
f._bf._size = f._w = 127; /* Leave room for the NUL */
@ -74,6 +75,7 @@ vswprintf_l(wchar_t * __restrict s, size_t n, locale_t locale,
sverrno = errno;
free(f._bf._base);
errno = sverrno;
*s = L'\0';
return (-1);
}
*f._p = '\0';
@ -87,6 +89,7 @@ vswprintf_l(wchar_t * __restrict s, size_t n, locale_t locale,
free(f._bf._base);
if (nwc == (size_t)-1) {
errno = EILSEQ;
*s = L'\0';
return (-1);
}
if (nwc == n) {