From 40598ff428fdfab9ba4fdd293787cc44d5ce24c3 Mon Sep 17 00:00:00 2001
From: David Greenman <dg@FreeBSD.org>
Date: Fri, 25 Nov 1994 04:11:19 +0000
Subject: [PATCH] Fixed bugs related to returning NULL if length is zero.

---
 lib/libc/i386/string/memchr.S | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/libc/i386/string/memchr.S b/lib/libc/i386/string/memchr.S
index 12a9298698ce..a1b2bcc4e2e9 100644
--- a/lib/libc/i386/string/memchr.S
+++ b/lib/libc/i386/string/memchr.S
@@ -27,11 +27,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: memchr.S,v 1.1 1994/08/05 01:18:28 wollman Exp $
+ *	$Id: memchr.S,v 1.2 1994/10/27 11:36:11 bde Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-        .asciz "$Id: memchr.S,v 1.1 1994/08/05 01:18:28 wollman Exp $"
+        .asciz "$Id: memchr.S,v 1.2 1994/10/27 11:36:11 bde Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
@@ -49,7 +49,8 @@ ENTRY(memchr)
 	movl	8(%esp),%edi		/* string address */
 	movl	12(%esp),%eax		/* set character to search for */
 	movl	16(%esp),%ecx		/* set length of search */
-	testl	%edi,%edi		/* clear Z flag, for len == 0 */
+	testl	%ecx,%ecx		/* return NULL if len == 0 */
+	jz	L1
 	cld				/* set search forward */
 	repne				/* search! */
 	scasb