Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e80a119 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Pass fault address to GWP-ASan's changed API." am: a812f456 am: 5e8b596f am: 3f399776 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385373



Change-Id: I3b436eb3b10a382d3c31923ddae4fe8636e9c25a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c07bab6c 3f399776

debuggerd/libdebuggerd/gwp_asan.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ GwpAsanCrashData::GwpAsanCrashData(unwindstack::Memory* process_memory, 
  thread_id_ = thread_info.tid;

  thread_id_ = thread_info.tid;





  // Grab the internal error address, if it exists.

  // Grab the internal error address, if it exists.

  uintptr_t internal_crash_address = __gwp_asan_get_internal_crash_address(&state_);

  uintptr_t internal_crash_address = __gwp_asan_get_internal_crash_address(&state_, crash_address_);

  if (internal_crash_address) {

  if (internal_crash_address) {

    crash_address_ = internal_crash_address;

    crash_address_ = internal_crash_address;

  }

  }