New module attribute 'Applicability'.

[gnulib.git] / tests / test-strstr.c

diff --git a/tests/test-strstr.c b/tests/test-strstr.c
index 600f7c7..c89a1ac 100644 (file)
--- a/tests/test-strstr.c
+++ b/tests/test-strstr.c
@@ -24,16 +24,18 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "zerosize-ptr.h"
+
 #define ASSERT(expr) \
-  do                                                                        \
-    {                                                                       \
-      if (!(expr))                                                          \
-       {                                                                    \
-         fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-         fflush (stderr);                                                   \
-         abort ();                                                          \
-       }                                                                    \
-    }                                                                       \
+  do                                                                         \
+    {                                                                        \
+      if (!(expr))                                                           \
+        {                                                                    \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          fflush (stderr);                                                   \
+          abort ();                                                          \
+        }                                                                    \
+    }                                                                        \
   while (0)
 
 int
@@ -61,15 +63,23 @@ main (int argc, char *argv[])
   }
 
   {
-    /* See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737 */
+    /* On some platforms, the memchr() functions reads past the first
+       occurrence of the byte to be searched, leading to an out-of-bounds
+       read access for strstr().
+       See <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737>.
+       This is a bug in memchr(), see the Austin Group's clarification
+       <http://www.opengroup.org/austin/docs/austin_454.txt>.  */
     const char *fix = "aBaaaaaaaaaaax";
-    char *input = malloc (strlen (fix) + 1);
+    char *page_boundary = (char *) zerosize_ptr ();
+    size_t len = strlen (fix) + 1;
+    char *input = page_boundary ? page_boundary - len : malloc (len);
     const char *result;
 
     strcpy (input, fix);
     result = strstr (input, "B1x");
     ASSERT (result == NULL);
-    free (input);
+    if (!page_boundary)
+      free (input);
   }
 
   {
@@ -101,16 +111,16 @@ main (int argc, char *argv[])
     char *haystack = (char *) malloc (m + 1);
     if (haystack != NULL)
       {
-       memset (haystack, 'A', m);
-       haystack[0] = 'B';
-       haystack[m] = '\0';
+        memset (haystack, 'A', m);
+        haystack[0] = 'B';
+        haystack[m] = '\0';
 
-       for (; repeat > 0; repeat--)
-         {
-           ASSERT (strstr (haystack, needle) == haystack + 1);
-         }
+        for (; repeat > 0; repeat--)
+          {
+            ASSERT (strstr (haystack, needle) == haystack + 1);
+          }
 
-       free (haystack);
+        free (haystack);
       }
   }
 
@@ -125,15 +135,15 @@ main (int argc, char *argv[])
     char *needle = (char *) malloc (m + 1);
     if (needle != NULL)
       {
-       memset (needle, 'A', m);
-       needle[m] = '\0';
+        memset (needle, 'A', m);
+        needle[m] = '\0';
 
-       for (; repeat > 0; repeat--)
-         {
-           ASSERT (strstr (haystack, needle) == NULL);
-         }
+        for (; repeat > 0; repeat--)
+          {
+            ASSERT (strstr (haystack, needle) == NULL);
+          }
 
-       free (needle);
+        free (needle);
       }
   }
 
@@ -144,18 +154,18 @@ main (int argc, char *argv[])
     char *needle = (char *) malloc (m + 2);
     if (haystack != NULL && needle != NULL)
       {
-       const char *result;
+        const char *result;
 
-       memset (haystack, 'A', 2 * m);
-       haystack[2 * m] = 'B';
-       haystack[2 * m + 1] = '\0';
+        memset (haystack, 'A', 2 * m);
+        haystack[2 * m] = 'B';
+        haystack[2 * m + 1] = '\0';
 
-       memset (needle, 'A', m);
-       needle[m] = 'B';
-       needle[m + 1] = '\0';
+        memset (needle, 'A', m);
+        needle[m] = 'B';
+        needle[m + 1] = '\0';
 
-       result = strstr (haystack, needle);
-       ASSERT (result == haystack + m);
+        result = strstr (haystack, needle);
+        ASSERT (result == haystack + m);
       }
     free (needle);
     free (haystack);