diff options
Diffstat (limited to 'src/multibyte')
| -rw-r--r-- | src/multibyte/mbrtowc.c | 3 | ||||
| -rw-r--r-- | src/multibyte/mbtowc.c | 3 | 
2 files changed, 4 insertions, 2 deletions
| diff --git a/src/multibyte/mbrtowc.c b/src/multibyte/mbrtowc.c index 35e834ee..e7b36540 100644 --- a/src/multibyte/mbrtowc.c +++ b/src/multibyte/mbrtowc.c @@ -14,6 +14,7 @@ size_t mbrtowc(wchar_t *restrict wc, const char *restrict src, size_t n, mbstate  	unsigned c;  	const unsigned char *s = (const void *)src;  	const unsigned N = n; +	wchar_t dummy;  	if (!st) st = (void *)&internal_state;  	c = *(unsigned *)st; @@ -21,7 +22,7 @@ size_t mbrtowc(wchar_t *restrict wc, const char *restrict src, size_t n, mbstate  	if (!s) {  		if (c) goto ilseq;  		return 0; -	} else if (!wc) wc = (void *)&wc; +	} else if (!wc) wc = &dummy;  	if (!n) return -2;  	if (!c) { diff --git a/src/multibyte/mbtowc.c b/src/multibyte/mbtowc.c index 6710637a..803d2213 100644 --- a/src/multibyte/mbtowc.c +++ b/src/multibyte/mbtowc.c @@ -12,10 +12,11 @@ int mbtowc(wchar_t *restrict wc, const char *restrict src, size_t n)  {  	unsigned c;  	const unsigned char *s = (const void *)src; +	wchar_t dummy;  	if (!s) return 0;  	if (!n) goto ilseq; -	if (!wc) wc = (void *)&wc; +	if (!wc) wc = &dummy;  	if (*s < 0x80) return !!(*wc = *s);  	if (*s-SA > SB-SA) goto ilseq; | 
