fix swprintf handling of nul character in output

[musl] / src / string / memccpy.c

diff --git a/src/string/memccpy.c b/src/string/memccpy.c
index 7c233d5..3b0a370 100644 (file)
--- a/src/string/memccpy.c
+++ b/src/string/memccpy.c
@@ -11,21 +11,24 @@ void *memccpy(void *restrict dest, const void *restrict src, int c, size_t n)
 {
        unsigned char *d = dest;
        const unsigned char *s = src;
-       size_t *wd, k;
-       const size_t *ws;
 
        c = (unsigned char)c;
+#ifdef __GNUC__
+       typedef size_t __attribute__((__may_alias__)) word;
+       word *wd;
+       const word *ws;
        if (((uintptr_t)s & ALIGN) == ((uintptr_t)d & ALIGN)) {
                for (; ((uintptr_t)s & ALIGN) && n && (*d=*s)!=c; n--, s++, d++);
                if ((uintptr_t)s & ALIGN) goto tail;
-               k = ONES * c;
+               size_t k = ONES * c;
                wd=(void *)d; ws=(const void *)s;
                for (; n>=sizeof(size_t) && !HASZERO(*ws^k);
                       n-=sizeof(size_t), ws++, wd++) *wd = *ws;
                d=(void *)wd; s=(const void *)ws;
        }
+#endif
        for (; n && (*d=*s)!=c; n--, s++, d++);
 tail:
-       if (*s==c) return d+1;
+       if (n) return d+1;
        return 0;
 }