commit 5e6f4e6f1cb8fac629c43e7583e72621d1659acc
author Florian Mayer <fmayer@google.com> Thu Dec 14 00:29:56 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 14 00:29:56 2023 +0000
tree 4b67b6b329ebb1c6bc545896746b99e2102086ab
parent fab3ca4f23b7dd90f0d6fc897da3f47ed5b1364e
parent 30fe6fa7d7c2ba1cd400300125a1245532d2d5ec

Merge "Use correct stack depot size in __scudo_get_error" into main am: 26c0b9017b am: 30fe6fa7d7

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

Change-Id: Ica1caf67d7ec711d937bfc3093252d76df0479fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

debuggerd/libdebuggerd/scudo.cpp

diff --git a/debuggerd/libdebuggerd/scudo.cpp b/debuggerd/libdebuggerd/scudo.cpp
index cff43f8..3fa3bd0 100644
--- a/debuggerd/libdebuggerd/scudo.cpp
+++ b/debuggerd/libdebuggerd/scudo.cpp
@@ -81,7 +81,7 @@
   }
 
   __scudo_get_error_info(&error_info_, process_info.maybe_tagged_fault_address, stack_depot.get(),
-                         __scudo_get_stack_depot_size(), region_info.get(), ring_buffer.get(),
+                         process_info.scudo_stack_depot_size, region_info.get(), ring_buffer.get(),
                          process_info.scudo_ring_buffer_size, memory.get(), memory_tags.get(),
                          memory_begin, memory_end - memory_begin);
 }