diff options
| author | Peter Collingbourne <pcc@google.com> | 2020-07-18 02:06:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-07-18 02:06:45 +0000 |
| commit | af7c3d5873d0b180fc352b24f6e0274863eb1913 (patch) | |
| tree | 717c1705c5679d8b273918e582713cd1acd559e0 /debuggerd/libdebuggerd/utility.cpp | |
| parent | 4aa073337d6b872ff87b702c4dcfa26142e6c9c2 (diff) | |
| parent | 10e428dd77181003942542d8de5c4615b693c610 (diff) | |
Merge "Fix dumping of heap memory."
Diffstat (limited to 'debuggerd/libdebuggerd/utility.cpp')
| -rw-r--r-- | debuggerd/libdebuggerd/utility.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/debuggerd/libdebuggerd/utility.cpp b/debuggerd/libdebuggerd/utility.cpp index c8a3431b7..0a491bbf6 100644 --- a/debuggerd/libdebuggerd/utility.cpp +++ b/debuggerd/libdebuggerd/utility.cpp @@ -135,6 +135,10 @@ void dump_memory(log_t* log, unwindstack::Memory* memory, uint64_t addr, const s addr -= 32; } + // We don't want the address tag to interfere with the bounds check below or appear in the + // addresses in the memory dump. + addr = untag_address(addr); + // Don't bother if the address looks too low, or looks too high. if (addr < 4096 || #if defined(__LP64__) |