commit 4841207b5301dd8110ec844a8e1e7ea64cd2ffef
author Florian Mayer <fmayer@google.com> Mon Dec 04 17:28:41 2023 -0800
committer Florian Mayer <fmayer@google.com> Mon Dec 04 17:29:23 2023 -0800
tree efbcd8e82a1788de4fb0333a8aa76f9bec83c2dc
parent e8fcfee409a3d23027fefef540155e41f84c98a6

Handle scudo_stack_depot_size = 0

Bug: 309446692
Change-Id: Ic55294316137847041f1e829cb0243aae8926379

debuggerd/libdebuggerd/scudo.cpp

diff --git a/debuggerd/libdebuggerd/scudo.cpp b/debuggerd/libdebuggerd/scudo.cpp
index c15bbea..17a1f79 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;
   }