commit b5d7105c22ee13786b488fbd6a8d1cf5dd971f44
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Dec 12 01:53:42 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 12 01:53:42 2023 +0000
tree ec4fde447a9e7034b46baa447055e14bdfe744d1
parent 541f064d68c9bd5d2d4cec3051d4fbc2d7257915
parent 1f5b0f9fee930e1f4dec0561bf70a56f9fa73433

Merge "Handle scudo_stack_depot_size = 0" into main am: 1f5b0f9fee

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

Change-Id: I2068d1baad5dec10e4c17d5b3406bc73dc4cf0cc
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 e0ef515..cff43f8 100644
--- a/debuggerd/libdebuggerd/scudo.cpp
+++ b/debuggerd/libdebuggerd/scudo.cpp
@@ -41,8 +41,6 @@
     return;
   }
 
-  auto stack_depot = AllocAndReadFully(process_memory, process_info.scudo_stack_depot,
-                                       process_info.scudo_stack_depot_size);
   auto region_info = AllocAndReadFully(process_memory, process_info.scudo_region_info,
                                        __scudo_get_region_info_size());
   std::unique_ptr<char[]> ring_buffer;
@@ -50,7 +48,12 @@
     ring_buffer = AllocAndReadFully(process_memory, process_info.scudo_ring_buffer,
                                     process_info.scudo_ring_buffer_size);
   }
-  if (!stack_depot || !region_info) {
+  std::unique_ptr<char[]> stack_depot;
+  if (process_info.scudo_stack_depot_size != 0) {
+    stack_depot = AllocAndReadFully(process_memory, process_info.scudo_stack_depot,
+                                    process_info.scudo_stack_depot_size);
+  }
+  if (!region_info) {
     return;
   }