iconv: Work around AIX 6.1..7.1 bug.

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

diff --git a/tests/test-strstr.c b/tests/test-strstr.c
index be75a66..1482e7d 100644 (file)
--- a/tests/test-strstr.c
+++ b/tests/test-strstr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2004, 2007-2010 Free Software Foundation, Inc.
  * Written by Bruno Haible and Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,20 +19,15 @@
 
 #include <string.h>
 
-#include <stdio.h>
+#include "signature.h"
+SIGNATURE_CHECK (strstr, char *, (char const *, char const *));
+
+#include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do                                                                        \
-    {                                                                       \
-      if (!(expr))                                                          \
-       {                                                                    \
-         fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-         abort ();                                                          \
-       }                                                                    \
-    }                                                                       \
-  while (0)
+#include "zerosize-ptr.h"
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
@@ -42,6 +37,7 @@ main (int argc, char *argv[])
      caused by SIGALRM.  All known platforms that lack alarm also have
      a quadratic strstr, and the replacement strstr is known to not
      take too long.  */
+  signal (SIGALRM, SIG_DFL);
   alarm (50);
 #endif
 
@@ -58,6 +54,26 @@ main (int argc, char *argv[])
   }
 
   {
+    /* 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 *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);
+    if (!page_boundary)
+      free (input);
+  }
+
+  {
     const char input[] = "ABC ABCDAB ABCDABCDABDE";
     const char *result = strstr (input, "ABCDABD");
     ASSERT (result == input + 15);
@@ -80,22 +96,22 @@ main (int argc, char *argv[])
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    char *needle =
+    const char *needle =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
     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);
       }
   }
 
@@ -104,21 +120,21 @@ main (int argc, char *argv[])
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    char *haystack =
+    const char *haystack =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB";
     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);
       }
   }
 
@@ -129,18 +145,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);