merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 5780bcd..588bd6f 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * memchr.c (memchr): Adjust condition to avoid infinite loop.
+
 2001-03-23  Jakub Jelinek  <jakub@redhat.com>
 
        * cp-demangle.c (demangle_discriminator): `_0' is discriminator #1,

diff --git a/libiberty/memchr.c b/libiberty/memchr.c
index cce3003..89aa98f 100644 (file)
--- a/libiberty/memchr.c
+++ b/libiberty/memchr.c
@@ -50,7 +50,7 @@ memchr (src_void, c, length)
 {
   const unsigned char *src = (const unsigned char *)src_void;
   
-  while (--length >= 0)
+  while (length-- > 0)
   {
     if (*src == c)
      return (PTR)src;