X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-memmem.c;h=395983e7090356bad5b2a18d2253e6a2dc539234;hb=6815bc73969d38c2226cf6e3366c1e4f4f756ba0;hp=e429ac096a452aadd7027032b3063e73dcb5b798;hpb=ae75d79451c1b7ba6085e14b80f94681bec35b1c;p=gnulib.git diff --git a/tests/test-memmem.c b/tests/test-memmem.c index e429ac096..395983e70 100644 --- a/tests/test-memmem.c +++ b/tests/test-memmem.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007, 2008 Free Software Foundation + * Copyright (C) 2004, 2007-2011 Free Software Foundation, Inc. * Written by Bruno Haible and Eric Blake * * This program is free software: you can redistribute it and/or modify @@ -19,22 +19,21 @@ #include +#include "signature.h" +SIGNATURE_CHECK (memmem, void *, (void const *, size_t, void const *, size_t)); + #include -#include #include #include -#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" + +static void * +null_ptr (void) +{ + return NULL; +} int main (int argc, char *argv[]) @@ -78,39 +77,58 @@ main (int argc, char *argv[]) ASSERT (result == input + 11); } - /* Check that length 0 does not dereference NULL. */ + /* Check that length 0 does not dereference the pointer. */ { - const char *result = memmem (NULL, 0, "foo", 3); + const char *result = memmem (zerosize_ptr (), 0, "foo", 3); ASSERT (result == NULL); } { 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); } } @@ -119,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); } } @@ -144,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); @@ -169,20 +187,110 @@ 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); } + { + /* Ensure that with a barely periodic "short" needle, memmem's + search does not mistakenly skip just past the match point. + This use of memmem would mistakenly return NULL before + gnulib v0.0-4927. */ + const char *haystack = + "\n" + "with_build_libsubdir\n" + "with_local_prefix\n" + "with_gxx_include_dir\n" + "with_cpp_install_dir\n" + "enable_generated_files_in_srcdir\n" + "with_gnu_ld\n" + "with_ld\n" + "with_demangler_in_ld\n" + "with_gnu_as\n" + "with_as\n" + "enable_largefile\n" + "enable_werror_always\n" + "enable_checking\n" + "enable_coverage\n" + "enable_gather_detailed_mem_stats\n" + "enable_build_with_cxx\n" + "with_stabs\n" + "enable_multilib\n" + "enable___cxa_atexit\n" + "enable_decimal_float\n" + "enable_fixed_point\n" + "enable_threads\n" + "enable_tls\n" + "enable_objc_gc\n" + "with_dwarf2\n" + "enable_shared\n" + "with_build_sysroot\n" + "with_sysroot\n" + "with_specs\n" + "with_pkgversion\n" + "with_bugurl\n" + "enable_languages\n" + "with_multilib_list\n"; + const char *needle = "\n" + "with_gnu_ld\n"; + const char* p = memmem (haystack, strlen (haystack), + needle, strlen (needle)); + ASSERT (p - haystack == 114); + } + + { + /* Same bug, shorter trigger. */ + const char *haystack = "..wi.d."; + const char *needle = ".d."; + const char* p = memmem (haystack, strlen (haystack), + needle, strlen (needle)); + ASSERT (p - haystack == 4); + } + + { + /* Like the above, but trigger the flaw in two_way_long_needle + by using a needle of length LONG_NEEDLE_THRESHOLD (32) or greater. + Rather than trying to find the right alignment manually, I've + arbitrarily chosen the following needle and template for the + haystack, and ensure that for each placement of the needle in + that haystack, memmem finds it. */ + const char *needle = "\nwith_gnu_ld-extend-to-len-32-b\n"; + const char *h = + "\n" + "with_build_libsubdir\n" + "with_local_prefix\n" + "with_gxx_include_dir\n" + "with_cpp_install_dir\n" + "with_e_\n" + "..............................\n" + "with_FGHIJKLMNOPQRSTUVWXYZ\n" + "with_567890123456789\n" + "with_multilib_list\n"; + size_t h_len = strlen (h); + char *haystack = malloc (h_len + 1); + size_t i; + ASSERT (haystack); + for (i = 0; i < h_len - strlen (needle); i++) + { + const char *p; + memcpy (haystack, h, h_len + 1); + memcpy (haystack + i, needle, strlen (needle) + 1); + p = memmem (haystack, strlen (haystack), needle, strlen (needle)); + ASSERT (p); + ASSERT (p - haystack == i); + } + } + return 0; }