This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch release/2.25/master updated. glibc-2.25-9-g74522ee


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, release/2.25/master has been updated
       via  74522eeeaa4a39809a28f44171e71d36a69edb58 (commit)
      from  f035c8d055f25eaf6c93772f308afac10ce31ef2 (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=74522eeeaa4a39809a28f44171e71d36a69edb58

commit 74522eeeaa4a39809a28f44171e71d36a69edb58
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 85d6fc6..321bf53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-03  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  Slava Barinov  <v.barinov@samsung.com>
 
 	[BZ #21289]
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 4885793..4e07663 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4902,7 +4902,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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]