tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Handle scudo_stack_depot_size = 0" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-12-12 01:24:03 +00:00 committed by Gerrit Code Review
commit 1f5b0f9fee
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

@ -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;
}