aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-04-01 12:39:09 +0530
committerSiddhesh Poyarekar <siddhesh@sourceware.org>2017-04-01 12:39:10 +0530
commit622222846a2e6ffbcd02cb46cb5f29c48fe4a466 (patch)
tree1bca80338aca6dc4d1afe0f211e42aeef50d6ce4
parent1361e98d5602e8b78cca019952d4a3438d68a239 (diff)
downloadglibc-622222846a2e6ffbcd02cb46cb5f29c48fe4a466.tar
glibc-622222846a2e6ffbcd02cb46cb5f29c48fe4a466.tar.gz
glibc-622222846a2e6ffbcd02cb46cb5f29c48fe4a466.tar.bz2
glibc-622222846a2e6ffbcd02cb46cb5f29c48fe4a466.zip
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
-rw-r--r--ChangeLog6
-rw-r--r--malloc/malloc.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b5d380e65f..0c95ed93b0 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 994a23248e..4c40e2ea19 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);