浏览代码

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.

(cherry picked from commit 6fbdeff0e51f6afc38fbb1476a4db81322779da4)
Timo Teräs 11 年之前
父节点
当前提交
043865cadf
共有 1 个文件被更改,包括 1 次插入0 次删除
  1. 1 0
      src/string/memmem.c

+ 1 - 0
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 */
 	/* Use faster algorithms for short needles */
 	h = memchr(h0, *n, k);
 	h = memchr(h0, *n, k);
 	if (!h || l==1) return (void *)h;
 	if (!h || l==1) return (void *)h;
+	k -= h - (const unsigned char *)h0;
 	if (l==2) return twobyte_memmem(h, k, n);
 	if (l==2) return twobyte_memmem(h, k, n);
 	if (l==3) return threebyte_memmem(h, k, n);
 	if (l==3) return threebyte_memmem(h, k, n);
 	if (l==4) return fourbyte_memmem(h, k, n);
 	if (l==4) return fourbyte_memmem(h, k, n);