X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-memmem.c;h=da0d1be37218bf162314a090c17d4bee8fc2e44b;hb=a4f38ec6be21630e9640cf8ead742c3a8d733fc2;hp=7f0f9257a3ee863ae472d43828178b3562793520;hpb=bb051a0a3c0febe9d3fabb21ae5b7fcc2ae7aa10;p=gnulib.git

diff --git a/tests/test-memmem.c b/tests/test-memmem.c
index 7f0f9257a..da0d1be37 100644
--- a/tests/test-memmem.c
+++ b/tests/test-memmem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2009 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,24 +19,21 @@
 
 #include <string.h>
 
+#include "signature.h"
+SIGNATURE_CHECK (memmem, void *, (void const *, size_t, void const *, size_t));
+
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "zerosize-ptr.h"
+#include "macros.h"
 
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+static void *
+null_ptr (void)
+{
+  return NULL;
+}
 
 int
 main (int argc, char *argv[])
@@ -88,31 +85,50 @@ main (int argc, char *argv[])
 
   {
     const char input[] = "foo";
-    const char *result = memmem (input, strlen (input), NULL, 0);
+    const char *result = memmem (input, strlen (input), null_ptr (), 0);
     ASSERT (result == input);
   }
 
+  /* Check that a long periodic needle does not cause false positives.  */
+  {
+    const char input[] = ("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"
+                          "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD"
+                          "_C3_A7_20_EF_BF_BD");
+    const char need[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD";
+    const char *result = memmem (input, strlen (input), need, strlen (need));
+    ASSERT (result == NULL);
+  }
+  {
+    const char input[] = ("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"
+                          "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD"
+                          "_C3_A7_20_EF_BF_BD_DA_B5_C2_A6_20"
+                          "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD");
+    const char need[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD";
+    const char *result = memmem (input, strlen (input), need, strlen (need));
+    ASSERT (result == input + 115);
+  }
+
   /* Check that a very long haystack is handled quickly if the needle is
      short and occurs near the beginning.  */
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    char *needle =
+    const char *needle =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
     size_t n = strlen (needle);
     char *haystack = (char *) malloc (m + 1);
     if (haystack != NULL)
       {
-	memset (haystack, 'A', m);
-	haystack[0] = 'B';
+        memset (haystack, 'A', m);
+        haystack[0] = 'B';
 
-	for (; repeat > 0; repeat--)
-	  {
-	    ASSERT (memmem (haystack, m, needle, n) == haystack + 1);
-	  }
+        for (; repeat > 0; repeat--)
+          {
+            ASSERT (memmem (haystack, m, needle, n) == haystack + 1);
+          }
 
-	free (haystack);
+        free (haystack);
       }
   }
 
@@ -121,21 +137,21 @@ main (int argc, char *argv[])
   {
     size_t repeat = 10000;
     size_t m = 1000000;
-    char *haystack =
+    const char *haystack =
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       "ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB";
     size_t n = strlen (haystack);
     char *needle = (char *) malloc (m + 1);
     if (needle != NULL)
       {
-	memset (needle, 'A', m);
+        memset (needle, 'A', m);
 
-	for (; repeat > 0; repeat--)
-	  {
-	    ASSERT (memmem (haystack, n, needle, m) == NULL);
-	  }
+        for (; repeat > 0; repeat--)
+          {
+            ASSERT (memmem (haystack, n, needle, m) == NULL);
+          }
 
-	free (needle);
+        free (needle);
       }
   }
 
@@ -146,16 +162,16 @@ main (int argc, char *argv[])
     char *needle = (char *) malloc (m + 1);
     if (haystack != NULL && needle != NULL)
       {
-	const char *result;
+        const char *result;
 
-	memset (haystack, 'A', 2 * m);
-	haystack[2 * m] = 'B';
+        memset (haystack, 'A', 2 * m);
+        haystack[2 * m] = 'B';
 
-	memset (needle, 'A', m);
-	needle[m] = 'B';
+        memset (needle, 'A', m);
+        needle[m] = 'B';
 
-	result = memmem (haystack, 2 * m + 1, needle, m + 1);
-	ASSERT (result == haystack + m);
+        result = memmem (haystack, 2 * m + 1, needle, m + 1);
+        ASSERT (result == haystack + m);
       }
     free (needle);
     free (haystack);
@@ -171,16 +187,16 @@ main (int argc, char *argv[])
     char *needle = (char *) malloc (n);
     if (haystack != NULL && needle != NULL)
       {
-	const char *result;
+        const char *result;
 
-	memset (haystack, 'A', m);
-	memset (needle, 'B', n);
+        memset (haystack, 'A', m);
+        memset (needle, 'B', n);
 
-	for (; repeat > 0; repeat--)
-	  {
-	    result = memmem (haystack, m, needle, n);
-	    ASSERT (result == NULL);
-	  }
+        for (; repeat > 0; repeat--)
+          {
+            result = memmem (haystack, m, needle, n);
+            ASSERT (result == NULL);
+          }
       }
     free (haystack);
     free (needle);