From e89cfe51d2001af08fc2a13e5133ba8157f90beb Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 1 Jul 2014 18:27:19 -0400 Subject: fix aliasing violations in mbtowc and mbrtowc these functions were setting wc to point to wchar_t aliasing itself as a "cheap" way to support null wc arguments. doing so was anything but cheap, since even without the aliasing violation, it would limit the compiler's ability to optimize. making wc point to a dummy object is equally easy and does not suffer from the above problems. --- src/multibyte/mbrtowc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/multibyte/mbrtowc.c') 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) { -- cgit v1.2.1