ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Handle scudo_ring_buffer_size = 0" am: cad7f577d1 am: ca83d5092b

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

Change-Id: I834a9d25a486d08d49e4cc70317615b80ad54b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florian Mayer 2023-01-13 19:11:19 +00:00 • committed by Automerger Merge Worker
commit 5edf44e021
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
debuggerd/libdebuggerd/scudo.cpp
View file

@ -44,9 +44,12 @@ ScudoCrashData::ScudoCrashData(unwindstack::Memory* process_memory,
__scudo_get_stack_depot_size());
auto region_info = AllocAndReadFully(process_memory, process_info.scudo_region_info,
__scudo_get_region_info_size());
auto ring_buffer = AllocAndReadFully(process_memory, process_info.scudo_ring_buffer,
process_info.scudo_ring_buffer_size);
if (!stack_depot || !region_info || !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);
}
if (!stack_depot || !region_info) {
return;
}