summaryrefslogtreecommitdiffstats
path: root/newlib/libc/string/strnlen.c
diff options
context:
space:
mode:
authorJeff Johnston <jjohnstn@redhat.com>2006-02-13 17:27:50 +0000
committerJeff Johnston <jjohnstn@redhat.com>2006-02-13 17:27:50 +0000
commitd6593503c64c42c7ce7b46716c26338856f1664c (patch)
tree38fbd34d431e1466704236159f80e301993a80a1 /newlib/libc/string/strnlen.c
parent3801e59ad881f230b7b71bb580dff32d07ba2e53 (diff)
downloadcygnal-d6593503c64c42c7ce7b46716c26338856f1664c.tar.gz
cygnal-d6593503c64c42c7ce7b46716c26338856f1664c.tar.bz2
cygnal-d6593503c64c42c7ce7b46716c26338856f1664c.zip
2006-02-13 Jeff Johnston <jjohnstn@redhat.com>
David Carne <davidcarne@gmail.com> * libc/string/strndup_r.c (_strndup_r): Use strnlen logic instead of strlen to determine number of bytes to copy. * libc/string/strnlen.c (strnlen): Fix so check for max limit occurs before looking at storage location.
Diffstat (limited to 'newlib/libc/string/strnlen.c')
-rw-r--r--newlib/libc/string/strnlen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c
index 92826eeb2..ed60e9371 100644
--- a/newlib/libc/string/strnlen.c
+++ b/newlib/libc/string/strnlen.c
@@ -42,7 +42,7 @@ _DEFUN (strnlen, (str, n),
{
_CONST char *start = str;
- while (*str && n-- > 0)
+ while (n-- > 0 && *str)
str++;
return str - start;