]> git.ipfire.org Git - thirdparty/glibc.git/commit
Fix assertion in malloc.c:tcache_get.
authorJoseph Myers <joseph@codesourcery.com>
Mon, 4 Feb 2019 23:46:58 +0000 (23:46 +0000)
committerJoseph Myers <joseph@codesourcery.com>
Mon, 4 Feb 2019 23:46:58 +0000 (23:46 +0000)
commit77dc0d8643aa99c92bf671352b0a8adde705896f
treeb923a316fb159a97d39d38ec39d6c72d4f1a53c1
parent7a0dcfc6439cd4e19bf393c2e2347e385361a82c
Fix assertion in malloc.c:tcache_get.

One of the warnings that appears with -Wextra is "ordered comparison
of pointer with integer zero" in malloc.c:tcache_get, for the
assertion:

  assert (tcache->entries[tc_idx] > 0);

Indeed, a "> 0" comparison does not make sense for
tcache->entries[tc_idx], which is a pointer.  My guess is that
tcache->counts[tc_idx] is what's intended here, and this patch changes
the assertion accordingly.

Tested for x86_64.

* malloc/malloc.c (tcache_get): Compare tcache->counts[tc_idx]
with 0, not tcache->entries[tc_idx].
ChangeLog
malloc/malloc.c