diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2008-08-23 05:34:37 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2008-08-23 05:34:37 +0000 |
| commit | 8ab2493c50b646a098b609180ee5ee1442203b12 (patch) | |
| tree | 6f2a67ba3c9327981de0c3190d637d5e4c9b9136 | |
| parent | cb762ea2dc495631a83f1e36bbd972bfdffb2df0 (diff) | |
unbreak wcschr(string, L'\0') which was incorrectly returning NULL
rather than a pointer to the terminating nul; ok deraadt@
| -rw-r--r-- | lib/libc/string/wcschr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c index c06127e087e..b84a2d32e3a 100644 --- a/lib/libc/string/wcschr.c +++ b/lib/libc/string/wcschr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wcschr.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ +/* $OpenBSD: wcschr.c,v 1.4 2008/08/23 05:34:36 djm Exp $ */ /* $NetBSD: wcschr.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ /*- @@ -37,12 +37,14 @@ wcschr(const wchar_t *s, wchar_t c) const wchar_t *p; p = s; - while (*p) { + for (;;) { if (*p == c) { /* LINTED interface specification */ return (wchar_t *)p; } + if (!*p) + return NULL; p++; } - return NULL; + /* NOTREACHED */ } |