X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-rawmemchr.c;h=c8a26bbbe2f9e80c68c05e072cfb19d5ff1bb429;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=963af3964b4addb763a77a0204c20561d933cd26;hpb=82381b9e5b37125305709d412d8322b35e5c4796;p=gnulib.git

diff --git a/tests/test-rawmemchr.c b/tests/test-rawmemchr.c
index 963af3964..c8a26bbbe 100644
--- a/tests/test-rawmemchr.c
+++ b/tests/test-rawmemchr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009 Free Software Foundation
+ * Copyright (C) 2008-2014 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,20 +19,13 @@
 
 #include <string.h>
 
-#include <stdio.h>
+#include "signature.h"
+SIGNATURE_CHECK (rawmemchr, void *, (void const *, int));
+
 #include <stdlib.h>
 
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-	{								     \
-	  fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-	  fflush (stderr);						     \
-	  abort ();							     \
-	}								     \
-    }									     \
-  while (0)
+#include "zerosize-ptr.h"
+#include "macros.h"
 
 /* Calculating void * + int is not portable, so this wrapper converts
    to char * to make the tests easier to write.  */
@@ -61,6 +54,7 @@ main (void)
 
   ASSERT (RAWMEMCHR (input + 1, 'a') == input + n - 1);
   ASSERT (RAWMEMCHR (input + 1, 'e') == input + n - 2);
+  ASSERT (RAWMEMCHR (input + 1, 0x789abc00 | 'e') == input + n - 2);
 
   ASSERT (RAWMEMCHR (input, '\0') == input + n);
 
@@ -78,6 +72,20 @@ main (void)
       }
   }
 
+  /* Ensure that no unaligned oversized reads occur.  */
+  {
+    char *page_boundary = (char *) zerosize_ptr ();
+    size_t i;
+
+    if (!page_boundary)
+      page_boundary = input + 4096;
+    memset (page_boundary - 512, '1', 511);
+    page_boundary[-1] = '2';
+    for (i = 1; i <= 512; i++)
+      ASSERT (RAWMEMCHR (page_boundary - i, (i * 0x01010100) | '2')
+              == page_boundary - 1);
+  }
+
   free (input);
 
   return 0;