mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-14 15:20:04 +00:00
adb65ebdcd
The example did not work because the null byte was not converted, and mbrtowc was called with a zero-length input string. This results in a (size_t) -2 return value, so the function always returns NULL. The size computation for the heap allocation of the result was incorrect because it did not deal with integer overflow. Error checking was missing, and the allocated memory was not freed on error paths. All error returns now set errno. (Note that there is an assumption that free does not clobber errno.) The slightly unportable comparision against (size_t) -2 to catch both (size_t) -1 and (size_t) -2 return values is gone as well. A null wide character needs to be stored in the result explicitly, to terminate it. The description in the manual is updated to deal with these finer points. The (size_t) -2 behavior (consuming the input bytes) matches what is specified in ISO C11. (cherry picked from commitcf138b0c83
) (cherry picked from commit690c3475f1
)
54 lines
1.2 KiB
C
54 lines
1.2 KiB
C
#include <stdbool.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
|
|
/* Do not include the above headers in the example.
|
|
*/
|
|
wchar_t *
|
|
mbstouwcs (const char *s)
|
|
{
|
|
/* Include the null terminator in the conversion. */
|
|
size_t len = strlen (s) + 1;
|
|
wchar_t *result = reallocarray (NULL, len, sizeof (wchar_t));
|
|
if (result == NULL)
|
|
return NULL;
|
|
|
|
wchar_t *wcp = result;
|
|
mbstate_t state;
|
|
memset (&state, '\0', sizeof (state));
|
|
|
|
while (true)
|
|
{
|
|
wchar_t wc;
|
|
size_t nbytes = mbrtowc (&wc, s, len, &state);
|
|
if (nbytes == 0)
|
|
{
|
|
/* Terminate the result string. */
|
|
*wcp = L'\0';
|
|
break;
|
|
}
|
|
else if (nbytes == (size_t) -2)
|
|
{
|
|
/* Truncated input string. */
|
|
errno = EILSEQ;
|
|
free (result);
|
|
return NULL;
|
|
}
|
|
else if (nbytes == (size_t) -1)
|
|
{
|
|
/* Some other error (including EILSEQ). */
|
|
free (result);
|
|
return NULL;
|
|
}
|
|
else
|
|
{
|
|
/* A character was converted. */
|
|
*wcp++ = towupper (wc);
|
|
len -= nbytes;
|
|
s += nbytes;
|
|
}
|
|
}
|
|
return result;
|
|
}
|