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

Commit 5edf44e0 authored by Florian Mayer's avatar Florian Mayer Committed by Automerger Merge Worker
Browse files

Merge "Handle scudo_ring_buffer_size = 0" am: cad7f577 am: ca83d509 

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



Change-Id: I834a9d25a486d08d49e4cc70317615b80ad54b92
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3726d0de ca83d509

debuggerd/libdebuggerd/scudo.cpp

+6 −3
Original line number Original line Diff line number Diff line
@@ -44,9 +44,12 @@ ScudoCrashData::ScudoCrashData(unwindstack::Memory* process_memory, 
                                       __scudo_get_stack_depot_size());

                                       __scudo_get_stack_depot_size());

  auto region_info = AllocAndReadFully(process_memory, process_info.scudo_region_info,

  auto region_info = AllocAndReadFully(process_memory, process_info.scudo_region_info,

                                       __scudo_get_region_info_size());

                                       __scudo_get_region_info_size());

  auto ring_buffer = AllocAndReadFully(process_memory, process_info.scudo_ring_buffer,

  std::unique_ptr<char[]> ring_buffer;

  if (process_info.scudo_ring_buffer_size != 0) {

    ring_buffer = AllocAndReadFully(process_memory, process_info.scudo_ring_buffer,

                                    process_info.scudo_ring_buffer_size);

                                    process_info.scudo_ring_buffer_size);

  if (!stack_depot || !region_info || !ring_buffer) {

  }

  if (!stack_depot || !region_info) {

    return;

    return;

  }

  }