| commit | 3f399776e65edac0b482eb0c49333c98b12e175f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jan 17 21:31:14 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 17 21:31:14 2023 +0000 |
| tree | 90c404d3b0d3efe54f3cd9daac905a40df8638a3 | |
| parent | ce3a092e46422429b5f3e60fd053e013807ef0ee [diff] | |
| parent | 5e8b596f13cb24d146c492bdb99ff1f55abd00b8 [diff] |
Merge "Pass fault address to GWP-ASan's changed API." am: a812f45678 am: 5e8b596f13 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385373 Change-Id: I72c55ea5788981d29f2f52a3a72c38f9679b9dea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/debuggerd/libdebuggerd/gwp_asan.cpp b/debuggerd/libdebuggerd/gwp_asan.cpp index d8f74e0..26084dc 100644 --- a/debuggerd/libdebuggerd/gwp_asan.cpp +++ b/debuggerd/libdebuggerd/gwp_asan.cpp
@@ -88,7 +88,7 @@ thread_id_ = thread_info.tid; // 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) { crash_address_ = internal_crash_address; }