diff options
| author | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-03-11 16:57:38 -0300 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-03-11 18:09:40 -0300 |
| commit | b43f552a8a23c0e405ab13a268bee12ada3b7841 (patch) | |
| tree | 948bd07081ed168302938e475159bb9b0c5c4f81 | |
| parent | 869d7180dd4a462674971a25b66070da7f2eabcf (diff) | |
| download | glibc-b43f552a8a23c0e405ab13a268bee12ada3b7841.tar.gz glibc-b43f552a8a23c0e405ab13a268bee12ada3b7841.tar.xz glibc-b43f552a8a23c0e405ab13a268bee12ada3b7841.zip | |
Fix type of parameter passed by malloc_consolidate
atomic_exchange_acq() expected a pointer, but was receiving an integer.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | malloc/malloc.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 440b0212d2..99fe2c9ac8 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 b8a43bfb32..1eed79414c 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); |