From 6fbdeff0e51f6afc38fbb1476a4db81322779da4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timo=20Ter=C3=A4s?= Date: Wed, 9 Apr 2014 21:06:17 -0400 Subject: [PATCH] fix search past the end of haystack in memmem to optimize the search, memchr is used to find the first occurrence of the first character of the needle in the haystack before switching to a search for the full needle. however, the number of characters skipped by this first step were not subtracted from the haystack length, causing memmem to search past the end of the haystack. --- src/string/memmem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/string/memmem.c b/src/string/memmem.c index 5211d759..a5a249f2 100644 --- a/src/string/memmem.c +++ b/src/string/memmem.c @@ -139,6 +139,7 @@ void *memmem(const void *h0, size_t k, const void *n0, size_t l) /* Use faster algorithms for short needles */ h = memchr(h0, *n, k); if (!h || l==1) return (void *)h; + k -= h - (const unsigned char *)h0; if (l==2) return twobyte_memmem(h, k, n); if (l==3) return threebyte_memmem(h, k, n); if (l==4) return fourbyte_memmem(h, k, n); -- 2.25.1