From 5da11ddf693c5029d76eeb1217745631d90b7181 Mon Sep 17 00:00:00 2001 From: delphij Date: Sat, 13 Mar 2010 00:15:06 +0000 Subject: Correct bugs fixed but not merged from my own tree. Pointy hat to: delphij MFC after: 1 month --- lib/libc/string/strlen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/libc/string') diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c index 0302ace..2bc1f2b 100644 --- a/lib/libc/string/strlen.c +++ b/lib/libc/string/strlen.c @@ -99,14 +99,15 @@ strlen(const char *str) lp = (const unsigned long *)((uintptr_t)str & ~LONGPTR_MASK); va = (*lp - mask01); vb = ((~*lp) & mask80); + lp++; if (va & vb) /* Check if we have \0 in the first part */ - for (p = str; (uintptr_t)p & LONGPTR_MASK; p++) + for (p = str; p < (const char *)lp; p++) if (*p == '\0') return (p - str); /* Scan the rest of the string using word sized operation */ - for (lp = (const unsigned long *)p; ; lp++) { + for (; ; lp++) { va = (*lp - mask01); vb = ((~*lp) & mask80); if (va & vb) { -- cgit v1.1