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

Commit 1f5b0f9f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Handle scudo_stack_depot_size = 0" into main

parents dcf3542d 4841207b

debuggerd/libdebuggerd/scudo.cpp

+6 −3
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ ScudoCrashData::ScudoCrashData(unwindstack::Memory* process_memory, 
    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 @@ ScudoCrashData::ScudoCrashData(unwindstack::Memory* process_memory, 
    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;

  }