Fix strstr and memmem algorithm.

(cherry picked from commit 5fb308bca2f333dcc835945be85e165cd7843d5b)

diff --git a/ChangeLog b/ChangeLog
index 08e1f75659eafb57b8aae979eafc4e57759ff23c..4391990cfa9c0739aed6b65363775dd51d9291fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-05  Eric Blake  <eblake@redhat.com>
+
+       [BZ #12092]
+       * string/str-two-way.h (two_way_long_needle): Always clear memory
+       when skipping input due to the shift table.
+
 2010-10-03  Ulrich Drepper  <drepper@gmail.com>
 
        [BZ #12077]

diff --git a/string/bug-strstr1.c b/string/bug-strstr1.c
new file mode 100644 (file)
index 0000000..889de12
--- /dev/null
+++ b/string/bug-strstr1.c
@@ -0,0 +1,26 @@
+#include <stdio.h>
+#include <string.h>
+
+int main (int argc, char** argv)
+{
+  const char haystack[] =
+    "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 needle[] =
+    "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD";
+
+  const char* sub = strstr (haystack, needle);
+
+  if (sub != NULL)
+    {
+      int j;
+
+      fprintf (stderr, "BUG: expected NULL, got:\n%s\n%s\n", sub, needle);
+      for (j = 0; needle[j] != '\0'; ++j)
+        putchar (needle[j] == sub[j] ? ' ' : '^');
+      puts ("");
+      return 1;
+    }
+
+  return 0;
+}

diff --git a/string/str-two-way.h b/string/str-two-way.h
index 87ed8a03668ce113db7d364dba3e96d69b516de9..73c99d9188983c58d0c5ae24f0a2568797579154 100644 (file)
--- a/string/str-two-way.h
+++ b/string/str-two-way.h
@@ -350,8 +350,8 @@ two_way_long_needle (const unsigned char *haystack, size_t haystack_len,
                     a byte out of place, there can be no match until
                     after the mismatch.  */
                  shift = needle_len - period;
-                 memory = 0;
                }
+             memory = 0;
              j += shift;
              continue;
            }