musl - musl - an implementation of the standard library for Linux-based systems

musl - an implementation of the standard library for Linux-based systems

diff options

author	Rich Felker <dalias@aerifal.cx>	2014年04月18日 17:38:35 -0400
committer	Rich Felker <dalias@aerifal.cx>	2014年04月18日 17:38:35 -0400
commit	476cd1d96560aaf7f210319597556e7fbcd60469 (patch)
tree	15d02708160ed765160ed8bec3885441eeba21c2 /src
parent	fbeadd150feaa7993250d2d6739df670d4539e54 (diff)
download	musl-476cd1d96560aaf7f210319597556e7fbcd60469.tar.gz

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

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.

Diffstat (limited to 'src')

-rw-r--r--

src/string/memmem.c

-rw-r--r--

src/string/strstr.c

-rw-r--r--

src/string/wcsstr.c

3 files changed, 3 insertions, 3 deletions

diff --git a/src/string/memmem.c b/src/string/memmem.c
index a5a249f2..3b1ae183 100644
--- a/src/string/memmem.c
+++ b/src/string/memmem.c

@@ -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;

}

diff --git a/src/string/strstr.c b/src/string/strstr.c
index 915c0a22..cd069127 100644
--- a/src/string/strstr.c
+++ b/src/string/strstr.c

@@ -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;

}

diff --git a/src/string/wcsstr.c b/src/string/wcsstr.c
index 3e28e287..4caaef3c 100644
--- a/src/string/wcsstr.c
+++ b/src/string/wcsstr.c

@@ -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;

}

generated by cgit v1.2.1 (git 2.18.0) at 2025年09月25日 10:26:37 +0000