about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2019-02-04 23:46:58 +0000
committerJoseph Myers <joseph@codesourcery.com>2019-02-04 23:46:58 +0000
commit77dc0d8643aa99c92bf671352b0a8adde705896f (patch)
treeb923a316fb159a97d39d38ec39d6c72d4f1a53c1
parent7a0dcfc6439cd4e19bf393c2e2347e385361a82c (diff)
downloadglibc-77dc0d8643aa99c92bf671352b0a8adde705896f.tar.gz
glibc-77dc0d8643aa99c92bf671352b0a8adde705896f.tar.xz
glibc-77dc0d8643aa99c92bf671352b0a8adde705896f.zip
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].
-rw-r--r--ChangeLog3
-rw-r--r--malloc/malloc.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d73c815c37..17d53b181a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2019-02-04  Joseph Myers  <joseph@codesourcery.com>
 
+	* malloc/malloc.c (tcache_get): Compare tcache->counts[tc_idx]
+	with 0, not tcache->entries[tc_idx].
+
 	* nscd/connections.c (reqinfo): Initialize SHUTDOWN element only
 	once.
 
diff --git a/malloc/malloc.c b/malloc/malloc.c
index feaf7ee0bf..13fc1f2049 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -2946,7 +2946,7 @@ tcache_get (size_t tc_idx)
 {
   tcache_entry *e = tcache->entries[tc_idx];
   assert (tc_idx < TCACHE_MAX_BINS);
-  assert (tcache->entries[tc_idx] > 0);
+  assert (tcache->counts[tc_idx] > 0);
   tcache->entries[tc_idx] = e->next;
   --(tcache->counts[tc_idx]);
   e->key = NULL;