about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-07-27 21:15:07 -0700
committerUlrich Drepper <drepper@redhat.com>2010-07-27 21:15:07 -0700
commit02b7acedbb6e98113571eb9f06a5b8683b20e942 (patch)
treed77705d4e7e3cde8eb44caf39cf0cf5a828aa9eb
parent880113d91ef4bb74b722d63bc2d3290e5afb5fbb (diff)
parentdeb9cabbf475da0b65d7acdb364987c4a15b4214 (diff)
downloadglibc-02b7acedbb6e98113571eb9f06a5b8683b20e942.tar.gz
glibc-02b7acedbb6e98113571eb9f06a5b8683b20e942.tar.xz
glibc-02b7acedbb6e98113571eb9f06a5b8683b20e942.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
-rw-r--r--ChangeLog5
-rw-r--r--manual/memory.texi5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 994655eaf5..97044ae451 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* sysdeps/x86_64/multiarch/strcmp-ssse3.S: Avoid compiling the file
 	for ld.so.
 
+2010-07-27  Andreas Schwab  <schwab@redhat.com>
+
+	* manual/memory.texi (Malloc Tunable Parameters): Document
+	M_PERTURB.
+
 2010-07-26  Roland McGrath  <roland@redhat.com>
 
 	[BZ #11840]
diff --git a/manual/memory.texi b/manual/memory.texi
index 59ea1ee342..db63c3313b 100644
--- a/manual/memory.texi
+++ b/manual/memory.texi
@@ -702,6 +702,11 @@ be allocated via @code{mmap}.
 @item M_MMAP_MAX
 The maximum number of chunks to allocate with @code{mmap}.  Setting this
 to zero disables all use of @code{mmap}.
+@item M_PERTURB
+If non-zero, memory blocks are filled with values depending on some
+low order bits of this parameter when they are allocated (except when
+allocated by @code{calloc}) and freed.  This can be used to debug the
+use of uninitialized or freed heap memory.
 @end table
 
 @end deftypefun