commit 0b27d314d6d7e66427af7354c05919a0ca8be6bc
author Christopher Ferris <cferris@google.com> Wed Nov 01 19:50:33 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 01 19:50:33 2023 +0000
tree 3f7a3eca678966d244d0d22b3c1f3ca7b9a190df
parent 85dd55530a92c4eb2a62150e59cd8e50045033bc
parent cfcb7b6c833dea9e4f73e652fdc02af2e6136432

Merge "Stop fp unwinding if the pc is 0." into main

libc/bionic/android_unsafe_frame_pointer_chase.cpp

diff --git a/libc/bionic/android_unsafe_frame_pointer_chase.cpp b/libc/bionic/android_unsafe_frame_pointer_chase.cpp
index 58b7cd8..7d5cd6c 100644
--- a/libc/bionic/android_unsafe_frame_pointer_chase.cpp
+++ b/libc/bionic/android_unsafe_frame_pointer_chase.cpp
@@ -82,7 +82,11 @@
     auto* frame = reinterpret_cast<frame_record*>(begin);
 #endif
     if (num_frames < num_entries) {
-      buf[num_frames] = __bionic_clear_pac_bits(frame->return_addr);
+      uintptr_t addr = __bionic_clear_pac_bits(frame->return_addr);
+      if (addr == 0) {
+        break;
+      }
+      buf[num_frames] = addr;
     }
     ++num_frames;
     if (frame->next_frame < begin + sizeof(frame_record) || frame->next_frame >= end ||