fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-12 22:41:37 +00:00
Code Issues Projects Releases Wiki Activity

fix false negatives with periodic needles in strstr, wcsstr, and memmem

Browse Source 
in cases where the memorized match range from the right factor
exceeded the length of the left factor, it was wrongly treated as a
mismatch rather than a match.

issue reported by Yves Bastide.
This commit is contained in:
Rich Felker
2014-04-18 17:38:35 -04:00
parent fbeadd150f
commit 476cd1d965
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/string/memmem.c
View File

@ -120,7 +120,7 @@ static char *twoway_memmem(const unsigned char *h, const unsigned char *z, const
}
/* Compare left half */
for (k=ms+1; k>mem && n[k-1] == h[k-1]; k--);
if (k == mem) return (char *)h;
if (k <= mem) return (char *)h;
h += p;
mem = mem0;
}

2
src/string/strstr.c
View File

@ -130,7 +130,7 @@ static char *twoway_strstr(const unsigned char *h, const unsigned char *n)
}
/* Compare left half */
for (k=ms+1; k>mem && n[k-1] == h[k-1]; k--);
if (k == mem) return (char *)h;
if (k <= mem) return (char *)h;
h += p;
mem = mem0;
}

2
src/string/wcsstr.c
View File

@ -84,7 +84,7 @@ static wchar_t *twoway_wcsstr(const wchar_t *h, const wchar_t *n)
}
/* Compare left half */
for (k=ms+1; k>mem && n[k-1] == h[k-1]; k--);
if (k == mem) return (wchar_t *)h;
if (k <= mem) return (wchar_t *)h;
h += p;
mem = mem0;
}