Fix strstr and memmem algorithm.
This commit is contained in:
parent
1c37565291
commit
5fb308bca2
|
@ -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 #12005]
|
||||
|
|
|
@ -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;
|
||||
}
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue