From 5c44738353ecaa1c81efca063ee8b55e092d7a43 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Wed, 5 Sep 2012 15:43:04 -0300 Subject: [PATCH] Don't change no_dyn_threshold on mallopt failure * malloc/malloc.c (__libc_mallopt) : Do not change internal state upon failure. --- ChangeLog | 5 +++++ malloc/malloc.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index db63a81d0e..6529e08f0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-09-05 Alexandre Oliva + + * malloc/malloc.c (__libc_mallopt) : Do not + change internal state upon failure. + 2012-09-05 Alexandre Oliva * malloc/mcheck.c (mcheck_check_all): Fix typo. diff --git a/malloc/malloc.c b/malloc/malloc.c index bd562df959..c69e281389 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -4769,8 +4769,10 @@ int __libc_mallopt(int param_number, int value) if((unsigned long)value > HEAP_MAX_SIZE/2) res = 0; else - mp_.mmap_threshold = value; - mp_.no_dyn_threshold = 1; + { + mp_.mmap_threshold = value; + mp_.no_dyn_threshold = 1; + } break; case M_MMAP_MAX: -- 2.43.5