summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-04-03 18:16:11 -0400
committerRich Felker <dalias@aerifal.cx>2011-04-03 18:16:11 -0400
commitc68b26369e89ead7511ef113850035775c5d183d (patch)
treeb75c4b530fb1426513b6043cb84198c88af27b33
parent2155afd73ef15b8a4ce0f0b488068120cca1f0b6 (diff)
downloadmusl-c68b26369e89ead7511ef113850035775c5d183d.tar.gz
fix serious bug in strchr - char signedness
search for bytes with high bit set was giving (potentially dangerous) wrong results. i've tested, cleaned up, and hopefully sped up this function now.
-rw-r--r--src/string/strchr.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/string/strchr.c b/src/string/strchr.c
index e606f4fe..2fe03386 100644
--- a/src/string/strchr.c
+++ b/src/string/strchr.c
@@ -10,14 +10,16 @@
char *strchr(const char *s, int c)
{
- c = (char)c;
+ size_t *w, k;
+
+ c = (unsigned char)c;
if (!c) return (char *)s + strlen(s);
- for (; ((uintptr_t)s & ALIGN) && *s && *s != c; s++);
- if (*s && *s != c) {
- const size_t *w;
- size_t k = ONES * c;
- for (w = (const void *)s; !HASZERO(*w) && !HASZERO(*w^k); w++);
- for (s = (const void *)w; *s && *s != c; s++);
- }
- return *s ? (char *)s : 0;
+
+ for (; ((uintptr_t)s & ALIGN) && *s; s++)
+ if (*(unsigned char *)s == c) return (char *)s;
+ k = ONES * c;
+ for (w = (void *)s; !HASZERO(*w) && !HASZERO(*w^k); w++);
+ for (s = (void *)w; *s; s++)
+ if (*(unsigned char *)s == c) return (char *)s;
+ return 0;
}