fix dlsym RTLD_NEXT support

[oweals/musl.git] / src / string / strchr.c

diff --git a/src/string/strchr.c b/src/string/strchr.c
index 2fe033868206cbd31e914de27aa9995f7d92023a..d3563f18c932d139b7b78f5e37a473518671a5a0 100644 (file)
--- a/src/string/strchr.c
+++ b/src/string/strchr.c
@@ -15,8 +15,9 @@ char *strchr(const char *s, int c)
        c = (unsigned char)c;
        if (!c) return (char *)s + strlen(s);
 
-       for (; ((uintptr_t)s & ALIGN) && *s; s++)
+       for (; ((uintptr_t)s & ALIGN); s++)
                if (*(unsigned char *)s == c) return (char *)s;
+               else if (!*s) return 0;
        k = ONES * c;
        for (w = (void *)s; !HASZERO(*w) && !HASZERO(*w^k); w++);
        for (s = (void *)w; *s; s++)