X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstring%2Fstrchr.c;h=d3563f18c932d139b7b78f5e37a473518671a5a0;hb=c1a9658bd19245ff0fb52d3da567815d822fb622;hp=2fe033868206cbd31e914de27aa9995f7d92023a;hpb=c68b26369e89ead7511ef113850035775c5d183d;p=musl

diff --git a/src/string/strchr.c b/src/string/strchr.c
index 2fe03386..d3563f18 100644
--- 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++)