From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 5 Apr 2011 13:27:41 +0000 (-0400)
Subject: fix misaligned read on early string termination in strchr
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=16675df793e896174230bdb6f99865c526830d3c

fix misaligned read on early string termination in strchr

this could actually cause rare crashes in the case where a short
string is located at the end of a page and the following page is not
readable, and in fact this was seen in gcc compiling certain files.
---

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++)