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.

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;