mirror of
git://git.musl-libc.org/musl
synced 2024-12-24 23:52:48 +00:00
fix read past end of haystack buffer for short needles in memmem
the two/three/four byte memmem specializations are not prepared to handle haystacks shorter than the needle; they unconditionally read at least up to the needle length and subtract from the haystack length. if the haystack is shorter, the remaining haystack length underflows and produces an unbounded search which will eventually either crash or find a spurious match. the top-level memmem function attempted to avoid this case already by checking for haystack shorter than needle, but it failed to re-check after using memchr to remove the maximal prefix not containing the first byte of the needle.
This commit is contained in:
parent
5c3412d225
commit
c718f9fc1b
@ -140,6 +140,7 @@ void *memmem(const void *h0, size_t k, const void *n0, size_t l)
|
||||
h = memchr(h0, *n, k);
|
||||
if (!h || l==1) return (void *)h;
|
||||
k -= h - (const unsigned char *)h0;
|
||||
if (k<l) return 0;
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user