This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.23-88-gb43f552
- From: tuliom at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Mar 2016 21:11:24 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-88-gb43f552
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via b43f552a8a23c0e405ab13a268bee12ada3b7841 (commit)
from 869d7180dd4a462674971a25b66070da7f2eabcf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b43f552a8a23c0e405ab13a268bee12ada3b7841
commit b43f552a8a23c0e405ab13a268bee12ada3b7841
Author: Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Date: Fri Mar 11 16:57:38 2016 -0300
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 440b021..99fe2c9 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 b8a43bf..1eed794 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);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
malloc/malloc.c | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources