From: Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Date: Fri, 11 Mar 2016 19:57:38 +0000 (-0300)
Subject: Fix type of parameter passed by malloc_consolidate
X-Git-Tag: glibc-2.24~490
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b43f552a8a23c0e405ab13a268bee12ada3b7841;p=thirdparty%2Fglibc.git

Fix type of parameter passed by malloc_consolidate

atomic_exchange_acq() expected a pointer, but was receiving an integer.
---

diff --git a/ChangeLog b/ChangeLog
index 440b0212d2b..99fe2c9ac8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-11  Tulio Magno Quites Machado Filho  <tuliom@linux.vnet.ibm.com>
+
+	* malloc/malloc.c (malloc_consolidate): Replace 0 by NULL in
+	order to match the type of p when calling atomic_exchange_acq().
+
 2016-03-11  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/powerpc32/power4/memcmp.S (memcmp): Rearrange
diff --git a/malloc/malloc.c b/malloc/malloc.c
index b8a43bfb32b..1eed79414c5 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4150,7 +4150,7 @@ static void malloc_consolidate(mstate av)
     maxfb = &fastbin (av, NFASTBINS - 1);
     fb = &fastbin (av, 0);
     do {
-      p = atomic_exchange_acq (fb, 0);
+      p = atomic_exchange_acq (fb, NULL);
       if (p != 0) {
 	do {
 	  check_inuse_chunk(av, p);