From: Wladimir J. van der Laan Date: Sat, 1 Apr 2017 07:09:09 +0000 (+0530) Subject: Call the right helper function when setting mallopt M_ARENA_MAX (BZ #21338) X-Git-Tag: glibc-2.26~660 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=622222846a2e6ffbcd02cb46cb5f29c48fe4a466;p=thirdparty%2Fglibc.git 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 b5d380e65ff..0c95ed93b01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-04-01 Wladimir van der Laan + + [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 * math/math.h: Fix check for __MATH_DECLARE_LDOUBLE. diff --git a/malloc/malloc.c b/malloc/malloc.c index 994a23248e2..4c40e2ea191 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);