Fix type of parameter passed by malloc_consolidate

atomic_exchange_acq() expected a pointer, but was receiving an integer.
This commit is contained in:
Tulio Magno Quites Machado Filho 2016-03-11 16:57:38 -03:00
parent 869d7180dd
commit b43f552a8a
2 changed files with 6 additions and 1 deletions

View File

@ -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

View File

@ -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);