From: Joseph Myers <joseph@codesourcery.com>
Date: Mon, 4 Feb 2019 23:46:58 +0000 (+0000)
Subject: Fix assertion in malloc.c:tcache_get.
X-Git-Tag: upstream/2.30~388
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77dc0d8643aa99c92bf671352b0a8adde705896f;p=platform%2Fupstream%2Fglibc.git

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].
---

diff --git a/ChangeLog b/ChangeLog
index d73c815c..17d53b1 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 feaf7ee..13fc1f2 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;