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.25-166-g6222228
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 1 Apr 2017 07:09:35 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.25-166-g6222228
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 622222846a2e6ffbcd02cb46cb5f29c48fe4a466 (commit)
from 1361e98d5602e8b78cca019952d4a3438d68a239 (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=622222846a2e6ffbcd02cb46cb5f29c48fe4a466
commit 622222846a2e6ffbcd02cb46cb5f29c48fe4a466
Author: Wladimir J. van der Laan <laanwj@gmail.com>
Date: Sat Apr 1 12:39:09 2017 +0530
Call the right helper function when setting mallopt M_ARENA_MAX (BZ #21338)
Fixes a typo introduced in commit
be7991c0705e35b4d70a419d117addcd6c627319. This caused
mallopt(M_ARENA_MAX) as well as the environment variable
MALLOC_ARENA_MAX to not work as intended because it set the
wrong internal parameter.
[BZ #21338]
* malloc/malloc.c: Call do_set_arena_max for M_ARENA_MAX
instead of incorrect do_set_arena_test
diff --git a/ChangeLog b/ChangeLog
index b5d380e..0c95ed9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-01 Wladimir van der Laan <laanwj@gmail.com>
+
+ [BZ# 21338]
+ * malloc/malloc.c: Call do_set_arena_max for M_ARENA_MAX
+ instead of incorrect do_set_arena_test
+
2017-03-31 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com>
* math/math.h: Fix check for __MATH_DECLARE_LDOUBLE.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 994a232..4c40e2e 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4904,7 +4904,7 @@ __libc_mallopt (int param_number, int value)
case M_ARENA_MAX:
if (value > 0)
- do_set_arena_test (value);
+ do_set_arena_max (value);
break;
}
__libc_lock_unlock (av->mutex);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
malloc/malloc.c | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources