From 15417de3e0f219574fb1f63dae24c33c5afb73e7 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 9 May 2009 14:45:07 +0000
Subject: [PATCH] * string/stratcliff.c (do_test): Test for zero length

	STRNLEN, MEMCHR, STRNCPY, STPNCPY, MEMCPY, MEMPCPY and memccpy
	at the end of the page.
---
 ChangeLog           |  6 ++++++
 string/stratcliff.c | 36 +++++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40ccb04403..567a81f7e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* string/stratcliff.c (do_test): Test for zero length
+	STRNLEN, MEMCHR, STRNCPY, STPNCPY, MEMCPY, MEMPCPY and memccpy
+	at the end of the page.
+
 2009-05-08  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_AT_RANDOM.
diff --git a/string/stratcliff.c b/string/stratcliff.c
index f90616c260..2bb59820f9 100644
--- a/string/stratcliff.c
+++ b/string/stratcliff.c
@@ -129,10 +129,10 @@ do_test (void)
         }
       for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
         {
-          for (inner = MAX (outer, nchars - 64); inner < nchars; ++inner)
+	  for (inner = MAX (outer, nchars - 64); inner <= nchars; ++inner)
 	    {
-	      if (STRNLEN (&adr[outer], inner - outer + 1)
-		  != (size_t) (inner - outer + 1))
+	      if (STRNLEN (&adr[outer], inner - outer)
+		  != (size_t) (inner - outer))
 		{
 		  printf ("%s flunked bounded for outer = %d, inner = %d\n",
 			  STRINGIFY (STRNLEN), outer, inner);
@@ -225,7 +225,7 @@ do_test (void)
 	      adr[middle] = L('T');
 	    }
         }
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
         {
 	  CHAR *cp = MEMCHR (&adr[outer], L('V'), nchars - outer);
 
@@ -279,9 +279,9 @@ do_test (void)
 	    }
         }
 
-      /* strncpy tests */
+      /* strncpy/wcsncpy tests */
       adr[nchars - 1] = L('T');
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
 	{
 	  size_t len;
 
@@ -355,6 +355,24 @@ do_test (void)
         }
 
       /* stpncpy/wcpncpy test */
+      adr[nchars - 1] = L('T');
+      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+	{
+	  size_t len;
+
+	  for (len = 0; len < nchars - outer; ++len)
+	    {
+	      if (STPNCPY (dest, &adr[outer], len) != dest + len
+		  || MEMCMP (dest, &adr[outer], len) != 0)
+		{
+		  printf ("outer %s flunked for outer = %d, len = %Zd\n",
+			  STRINGIFY (STPNCPY), outer, len);
+		  result = 1;
+		}
+	    }
+	}
+      adr[nchars - 1] = L('\0');
+
       for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
         {
           for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
@@ -378,7 +396,7 @@ do_test (void)
         }
 
       /* memcpy/wmemcpy test */
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
 	for (inner = 0; inner < nchars - outer; ++inner)
 	  if (MEMCPY (dest, &adr[outer], inner) !=  dest)
 	    {
@@ -388,7 +406,7 @@ do_test (void)
 	    }
 
       /* mempcpy/wmempcpy test */
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
 	for (inner = 0; inner < nchars - outer; ++inner)
 	  if (MEMPCPY (dest, &adr[outer], inner) !=  dest + inner)
 	    {
@@ -401,7 +419,7 @@ do_test (void)
 #ifndef WCSTEST
       /* memccpy test */
       memset (adr, '\0', nchars);
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
 	for (inner = 0; inner < nchars - outer; ++inner)
 	  if (memccpy (dest, &adr[outer], L('\1'), inner) != NULL)
 	    {
-- 
2.11.4.GIT