about summary refs log tree commit diff
path: root/string
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2010-10-06 13:48:07 -0400
committerUlrich Drepper <drepper@gmail.com>2010-10-06 13:48:07 -0400
commit5fb308bca2f333dcc835945be85e165cd7843d5b (patch)
treef67ddffc0b758348e8f55ee94b69730af0955240 /string
parent1c375652919fb4482ae946d1cd612fa655429e11 (diff)
downloadglibc-5fb308bca2f333dcc835945be85e165cd7843d5b.tar.gz
glibc-5fb308bca2f333dcc835945be85e165cd7843d5b.tar.xz
glibc-5fb308bca2f333dcc835945be85e165cd7843d5b.zip
Fix strstr and memmem algorithm.
Diffstat (limited to 'string')
-rw-r--r--string/bug-strstr1.c26
-rw-r--r--string/str-two-way.h2
2 files changed, 27 insertions, 1 deletions
diff --git a/string/bug-strstr1.c b/string/bug-strstr1.c
new file mode 100644
index 0000000000..889de12955
--- /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 502af47046..76044b34fe 100644
--- 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;
 	    }