commit 04e737c826c0295775c62c110c25876e10f97685
author Josh Gao <jmgao@google.com> Thu Dec 05 19:23:45 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 05 19:23:45 2019 -0800
tree 3070534288b1ca04589e850ae8019f86e91ffdd0
parent 572d1a40640c64af4140f707cccd5ab20995ef99
parent 757e44ce10edeb53a5e717e0250344b2ee4ea181

Merge "unwindstack: fix dangling pointer in LocalUpdatableMaps."
am: 6e0a0dad52

Change-Id: Ia4a79c5b1120175b3176edb750722c5743bc1f05

libunwindstack/Maps.cpp

diff --git a/libunwindstack/Maps.cpp b/libunwindstack/Maps.cpp
index 250e600..0ab68db 100644
--- a/libunwindstack/Maps.cpp
+++ b/libunwindstack/Maps.cpp
@@ -139,6 +139,9 @@
       if (start == info->start && end == info->end && flags == info->flags && *name == info->name) {
         // No need to check
         search_map_idx = old_map_idx + 1;
+        if (new_map_idx + 1 < maps_.size()) {
+          maps_[new_map_idx + 1]->prev_map = info.get();
+        }
         maps_[new_map_idx] = nullptr;
         total_entries--;
         break;