From: DJ Delorie <dj@redhat.com>
Date: Wed, 28 Mar 2001 05:02:47 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: dberlin-typesystem-branchpoint~877
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30a1def20d43b665660f606caa2dbe1c0b88b8e3;p=thirdparty%2Fbinutils-gdb.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 5780bcdc383..588bd6fcb89 100644
--- 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 cce30039437..89aa98f1d94 100644
--- 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;