X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstring%2Fmemmem.c;h=d7e1221940b013810f1e26261357dc2609f2051b;hb=cef0f289f666b6c963bfd11537a6d80916ff889e;hp=a5a249f2ca04a350e77d9bc7ff1ca31891b32c1b;hpb=6fbdeff0e51f6afc38fbb1476a4db81322779da4;p=musl

diff --git a/src/string/memmem.c b/src/string/memmem.c
index a5a249f2..d7e12219 100644
--- a/src/string/memmem.c
+++ b/src/string/memmem.c
@@ -112,15 +112,15 @@ static char *twoway_memmem(const unsigned char *h, const unsigned char *z, const
 		}
 
 		/* Compare right half */
-		for (k=MAX(ms+1,mem); n[k] && n[k] == h[k]; k++);
-		if (n[k]) {
+		for (k=MAX(ms+1,mem); k<l && n[k] == h[k]; k++);
+		if (k < l) {
 			h += k-ms;
 			mem = 0;
 			continue;
 		}
 		/* 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;
 	}