RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Rich Felker 2011-04-05 09:27:41 -04:00
parent 2f3d02cd83
commit 16675df793
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/string/strchr.c
View File

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