diff options
| author | Elliott Hughes <enh@google.com> | 2013-06-12 14:05:46 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-06-12 14:14:53 -0700 |
| commit | 61e699a133a4807fe878a6cb0d7190d7c96e21f8 (patch) | |
| tree | 12dd46e7f8e5f7172a3fe0fd9075fa929cbb1001 /libc/Android.mk | |
| parent | 5cde15eb17f4ddc0949c0cbd38a46e6c0bad7019 (diff) | |
| download | bionic-61e699a133a4807fe878a6cb0d7190d7c96e21f8.zip bionic-61e699a133a4807fe878a6cb0d7190d7c96e21f8.tar.gz bionic-61e699a133a4807fe878a6cb0d7190d7c96e21f8.tar.bz2 | |
Clean up abort.
* A dlmalloc usage error shouldn't call abort(3) because we want to
cause a SIGSEGV by writing the address dlmalloc didn't like to an
address the kernel won't like, so that debuggerd will dump the
memory around the address that upset dlmalloc.
* Switch to the simpler FreeBSD/NetBSD style of registering stdio
cleanup. Hopefully this will let us simplify more of the stdio
implementation.
* Clear the stdio cleanup handler before we abort because of a dlmalloc
corruption error. This fixes the reported bug, where we'd hang inside
dlmalloc because the stdio cleanup reentered dlmalloc.
Bug: 9301265
Change-Id: Ief31b389455d6876e5a68f0f5429567d37277dbc
Diffstat (limited to 'libc/Android.mk')
| -rw-r--r-- | libc/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index c98bf9e..49d93af 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -6,7 +6,6 @@ include $(LOCAL_PATH)/arch-$(TARGET_ARCH)/syscalls.mk # ========================================================= libc_common_src_files := \ $(syscall_src) \ - unistd/abort.c \ unistd/alarm.c \ unistd/exec.c \ unistd/fnmatch.c \ @@ -192,6 +191,7 @@ libc_common_src_files := \ netbsd/nameser/ns_samedomain.c \ libc_bionic_src_files := \ + bionic/abort.cpp \ bionic/assert.cpp \ bionic/brk.cpp \ bionic/dirent.cpp \ |