[ipfire-2.x.git] / src / patches / glibc / glibc-rh1256891.patch

commit 5c44738353ecaa1c81efca063ee8b55e092d7a43
Author: Alexandre Oliva <aoliva@redhat.com>
Date:   Wed Sep 5 15:43:04 2012 -0300

    Don't change no_dyn_threshold on mallopt failure
    
    	* malloc/malloc.c (__libc_mallopt) <M_MMAP_THRESHOLD>: Do not
    	change internal state upon failure.

diff --git a/malloc/malloc.c b/malloc/malloc.c
index bd562df..c69e281 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4769,8 +4769,10 @@ int __libc_mallopt(int param_number, int value)
       res = 0;
     else
 #endif
-      mp_.mmap_threshold = value;
-      mp_.no_dyn_threshold = 1;
+      {
+	mp_.mmap_threshold = value;
+	mp_.no_dyn_threshold = 1;
+      }
     break;
 
   case M_MMAP_MAX:
Commit	Line	Data
bb330e25 AF	1	commit 5c44738353ecaa1c81efca063ee8b55e092d7a43
	2	Author: Alexandre Oliva <aoliva@redhat.com>
	3	Date: Wed Sep 5 15:43:04 2012 -0300
	4
	5	Don't change no_dyn_threshold on mallopt failure
	6
	7	* malloc/malloc.c (__libc_mallopt) <M_MMAP_THRESHOLD>: Do not
	8	change internal state upon failure.
	9
	10	diff --git a/malloc/malloc.c b/malloc/malloc.c
	11	index bd562df..c69e281 100644
	12	--- a/malloc/malloc.c
	13	+++ b/malloc/malloc.c
	14	@@ -4769,8 +4769,10 @@ int __libc_mallopt(int param_number, int value)
	15	res = 0;
	16	else
	17	#endif
	18	- mp_.mmap_threshold = value;
	19	- mp_.no_dyn_threshold = 1;
	20	+ {
	21	+ mp_.mmap_threshold = value;
	22	+ mp_.no_dyn_threshold = 1;
	23	+ }
	24	break;
	25
	26	case M_MMAP_MAX: