commit c479e4e789df355a25508a0ed38791978253a2e3
author Florian Mayer <fmayer@google.com> Wed Jan 23 13:35:40 2019 +0000
committer Christopher Ferris <cferris@google.com> Thu Jan 24 16:29:36 2019 -0800
tree eaf739ac359890f90d55ac395a2c968a65338660
parent 10b0a155ee73bedca2d1bd9fefac2727b42ebf08

Fix crash in libunwindstack.

Bug: 122657596

Test: New unit test that crashes without this change.
Change-Id: I5d978530a833345def94a58805d7ee93b23382bb

libunwindstack/Unwinder.cpp

diff --git a/libunwindstack/Unwinder.cpp b/libunwindstack/Unwinder.cpp
index 0dd95cf..2734cf8 100644
--- a/libunwindstack/Unwinder.cpp
+++ b/libunwindstack/Unwinder.cpp
@@ -247,7 +247,7 @@
         // or the pc in the first frame is in a valid map.
         // This allows for a case where the code jumps into the middle of
         // nowhere, but there is no other unwind information after that.
-        if (frames_.size() != 2 || maps_->Find(frames_[0].pc) != nullptr) {
+        if (frames_.size() > 2 || (frames_.size() > 0 && maps_->Find(frames_[0].pc) != nullptr)) {
           // Remove the speculative frame.
           frames_.pop_back();
         }