lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00
Code Activity

Avoid assertion in processes with VM in bad shape

Browse Source
This commit is contained in:
Ulrich Drepper
2011-10-29 16:39:03 -04:00
parent 9beb233493
commit 6ef76f3b51
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2011-10-29 Ulrich Drepper <drepper@gmail.com> 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. * posix/sys/wait.h: Mark wait and wait4 with __THROWNL.
* libio/stdio.h: Mark sprintf, vsprintf snprintf, vsnprintf, vasprintf, * libio/stdio.h: Mark sprintf, vsprintf snprintf, vsnprintf, vasprintf,
asprintf, __asprintf, obstack_printf, obstack_vprintf with __THROWNL. asprintf, __asprintf, obstack_printf, obstack_vprintf with __THROWNL.

8
malloc/malloc.c
View File

@@ -2855,10 +2855,10 @@ munmap_chunk(mchunkptr p)
mp_.n_mmaps--; mp_.n_mmaps--;
mp_.mmapped_mem -= total_size; mp_.mmapped_mem -= total_size;
int ret __attribute__ ((unused)) = munmap((char *)block, total_size); /* If munmap failed the process virtual memory address space is in a
bad shape. Just leave the block hanging around, the process will
/* munmap returns non-zero on failure */ terminate shortly anyway since not much can be done. */
assert(ret == 0); munmap((char *)block, total_size);
} }
#if HAVE_MREMAP #if HAVE_MREMAP