From 16675df793e896174230bdb6f99865c526830d3c Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 5 Apr 2011 09:27:41 -0400 Subject: 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. --- src/string/strchr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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++) -- cgit v1.2.1