diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-06-23 23:38:20 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-06-23 23:38:20 +0000 |
| commit | 37a2e2e98baf49fd965bebb2c9c9b1a7b0428109 (patch) | |
| tree | 4601202d543b7ce59ef9eb9bc3e77c470881c64b | |
| parent | d23b5ace10c240e8773dabf6f606534c46405b83 (diff) | |
[asan] Add support for Android debug message.
Add ASan report to the "debug message" field in Android tombstones.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@306184 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/asan/asan_report.cc | 8 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_common.h | 3 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_linux_libcdep.cc | 7 |
3 files changed, 18 insertions, 0 deletions
diff --git a/lib/asan/asan_report.cc b/lib/asan/asan_report.cc index f751b6184..2e477f258 100644 --- a/lib/asan/asan_report.cc +++ b/lib/asan/asan_report.cc @@ -204,6 +204,14 @@ class ScopedInErrorReport { error_report_callback(buffer_copy.data()); } + if (halt_on_error_ && common_flags()->abort_on_error) { + // On Android the message is truncated to 512 characters. + // FIXME: implement "compact" error format, possibly without, or with + // highly compressed stack traces? + // FIXME: or just use the summary line as abort message? + SetAbortMessage(buffer_copy.data()); + } + // In halt_on_error = false mode, reset the current error object (before // unlocking). if (!halt_on_error_) diff --git a/lib/sanitizer_common/sanitizer_common.h b/lib/sanitizer_common/sanitizer_common.h index 3c6f9fcee..560c53b64 100644 --- a/lib/sanitizer_common/sanitizer_common.h +++ b/lib/sanitizer_common/sanitizer_common.h @@ -810,8 +810,11 @@ INLINE void LogMessageOnPrintf(const char *str) {} #if SANITIZER_LINUX // Initialize Android logging. Any writes before this are silently lost. void AndroidLogInit(); +void SetAbortMessage(const char *); #else INLINE void AndroidLogInit() {} +// FIXME: MacOS implementation could use CRSetCrashLogMessage. +INLINE void SetAbortMessage(const char *) {} #endif #if SANITIZER_ANDROID diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc index 894013ddd..b9a48a1e4 100644 --- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc +++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc @@ -551,6 +551,13 @@ void LogMessageOnPrintf(const char *str) { WriteToSyslog(str); } +#if SANITIZER_ANDROID && __ANDROID_API__ >= 21 +extern "C" void android_set_abort_message(const char *msg); +void SetAbortMessage(const char *str) { android_set_abort_message(str); } +#else +void SetAbortMessage(const char *str) {} +#endif + #endif // SANITIZER_LINUX } // namespace __sanitizer |