This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-472-g2a0c698
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 29 Oct 2011 20:39:57 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-472-g2a0c698
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, master has been updated
via 2a0c698e2427394c5263fbcb986ba509b309b8c7 (commit)
via 6ef76f3b515c45a83f7831f806bf97a2af9ed008 (commit)
from 9beb2334930db81ceada5aa6051fe5ac0554db32 (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2a0c698e2427394c5263fbcb986ba509b309b8c7
commit 2a0c698e2427394c5263fbcb986ba509b309b8c7
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Oct 29 16:39:47 2011 -0400
Add bug number
diff --git a/NEWS b/NEWS
index 75d9706..663c7ec 100644
--- a/NEWS
+++ b/NEWS
@@ -11,8 +11,8 @@ Version 2.15
6779, 6783, 9696, 10709, 11589, 12403, 12847, 12868, 12852, 12874, 12885,
12892, 12907, 12922, 12935, 13007, 13021, 13067, 13068, 13090, 13092,
- 13114, 13118, 13123, 13134, 13138, 13150, 13179, 13192, 13268, 13291,
- 13335, 13337, 13344, 13358
+ 13114, 13118, 13123, 13134, 13138, 13150, 13179, 13192, 13268, 13276,
+ 13291, 13335, 13337, 13344, 13358
* New program pldd to list loaded object of a process
Implemented by Ulrich Drepper.
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6ef76f3b515c45a83f7831f806bf97a2af9ed008
commit 6ef76f3b515c45a83f7831f806bf97a2af9ed008
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Oct 29 16:39:03 2011 -0400
Avoid assertion in processes with VM in bad shape
diff --git a/ChangeLog b/ChangeLog
index 21aa451..4fccd94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-10-29 Ulrich Drepper <drepper@gmail.com>
+ [BZ #13276]
+ * malloc/malloc.c (munmap_chunk): Don't use assertion to check munmap
+ return value.
+
* posix/sys/wait.h: Mark wait and wait4 with __THROWNL.
* libio/stdio.h: Mark sprintf, vsprintf snprintf, vsnprintf, vasprintf,
asprintf, __asprintf, obstack_printf, obstack_vprintf with __THROWNL.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 864c7d9..8608083 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -2855,10 +2855,10 @@ munmap_chunk(mchunkptr p)
mp_.n_mmaps--;
mp_.mmapped_mem -= total_size;
- int ret __attribute__ ((unused)) = munmap((char *)block, total_size);
-
- /* munmap returns non-zero on failure */
- assert(ret == 0);
+ /* If munmap failed the process virtual memory address space is in a
+ bad shape. Just leave the block hanging around, the process will
+ terminate shortly anyway since not much can be done. */
+ munmap((char *)block, total_size);
}
#if HAVE_MREMAP
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
NEWS | 4 ++--
malloc/malloc.c | 8 ++++----
3 files changed, 10 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources