Merge "Stop fp unwinding if the pc is 0." into main am: 0b27d314d6
am: 94df76e5ed
am: e013c439b8
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2813433 Change-Id: Iaef76f9c61b7a645343ed407747ca2edef72565c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
abe2b20309
1 changed files with 5 additions and 1 deletions
|
@ -82,7 +82,11 @@ __attribute__((no_sanitize("address", "hwaddress"))) size_t android_unsafe_frame
|
||||||
auto* frame = reinterpret_cast<frame_record*>(begin);
|
auto* frame = reinterpret_cast<frame_record*>(begin);
|
||||||
#endif
|
#endif
|
||||||
if (num_frames < num_entries) {
|
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;
|
++num_frames;
|
||||||
if (frame->next_frame < begin + sizeof(frame_record) || frame->next_frame >= end ||
|
if (frame->next_frame < begin + sizeof(frame_record) || frame->next_frame >= end ||
|
||||||
|
|
Loading…
Reference in a new issue