diff options
| author | Christopher Ferris <cferris@google.com> | 2019-01-23 01:43:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-23 01:43:47 +0000 |
| commit | 0a692a6d8d8c003749f959b6073f32f9c2c07604 (patch) | |
| tree | d470055e9c71be4cb3b5524050e347d497cc40a3 /libc/malloc_debug/PointerData.cpp | |
| parent | 011523f4dfd65fea3be3e5f2004cb090a557e868 (diff) | |
| parent | 7f209a979c55a58e91946a2efd5f0b339ffe309c (diff) | |
Merge "Bionic malloc debug: add a new option "abort_on_error""
Diffstat (limited to 'libc/malloc_debug/PointerData.cpp')
| -rw-r--r-- | libc/malloc_debug/PointerData.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libc/malloc_debug/PointerData.cpp b/libc/malloc_debug/PointerData.cpp index b0e2fc849..638061b11 100644 --- a/libc/malloc_debug/PointerData.cpp +++ b/libc/malloc_debug/PointerData.cpp @@ -206,7 +206,7 @@ void PointerData::Remove(const void* ptr) { std::lock_guard<std::mutex> pointer_guard(pointer_mutex_); auto entry = pointers_.find(pointer); if (entry == pointers_.end()) { - // Error. + // Attempt to remove unknown pointer. error_log("No tracked pointer found for 0x%" PRIxPTR, pointer); return; } @@ -283,6 +283,9 @@ void PointerData::LogFreeError(const FreePointerInfoType& info, size_t usable_si } error_log(LOG_DIVIDER); + if (g_debug->config().options() & ABORT_ON_ERROR) { + abort(); + } } void PointerData::VerifyFreedPointer(const FreePointerInfoType& info) { @@ -295,6 +298,9 @@ void PointerData::VerifyFreedPointer(const FreePointerInfoType& info) { error_log("+++ ALLOCATION 0x%" PRIxPTR " HAS CORRUPTED HEADER TAG 0x%x AFTER FREE", info.pointer, header->tag); error_log(LOG_DIVIDER); + if (g_debug->config().options() & ABORT_ON_ERROR) { + abort(); + } // Stop processing here, it is impossible to tell how the header // may have been damaged. |